Fixing happy path to to do it correct order