Updated UX flow