Updated walkthrough sample