updated User and UserController