Added more calls to the listener script