Renamed the event handler functions