properly merged event.rb changes