Updated
Updated and merged UserController