Modified flow to improve UX