Adjusting eventhandlers