Changed the user flow