refactoring flow and user, playground-333