Improved Event Listening