More user-flow updates