change to the new user model