changes
changes in user.rb