Handle events smarter'
Update event handling