Update to the latest event listener stuff