rework event handler