upgrade, more event listeners added