fixing eventHandler stuff