lots of user flow updates v4