starting to fix event handling up