Replaced Listener with Callable