lots of user flow updates v9