updated user model
added return statements