Updated general user flow