add extra events and updated template