event handling updated