Update for listener. WOrking now.