working on the user flow