modified message.rb