Removed logging and using originalEvent