Modified event handling