Changinfg up user flow