more updates to listen class.
...