Changes after walkthrough