adjusted event listeners