updated for latest event

added new event handling