added more event listeners