Update addEvent_2.0