Improvements to listener.