refactored me to user