Changed the event calling