modify eventhandler