improved eventhandler