more changes with Listener Service