stopped recreating the event handler and moved it out of the main object