removed duplicate methods from User
mergin?