Modified EventListener.