Improved walkthrough