Made changes to EventListner.class