Added Event Listener and comments