lots of user flow updates v3