changes merged with Yonet and walkthrough working