lots of user flow updates v6