moved anonymous functions into their own Listener.