Did some work on the eventlistener