changed the UX flow