Added more things to event handler.