worked a little bit on the EventHandler. Hoping it works