Added some eventListeners