added new event and changed order of events