Even with the obvious rewrites, it still remained a great story through and through