lots of user flow updates v5