continued User refactoring