moved an event handler and added a comment