adjust eventhandlers