Add Listener back in