Updated user model
updated controller