Modified class.rb