Removed use of Events object