Improved user.rb