Changed how eventhandler is specified