improved the performance of the listener module