lots of user flow updates v7