Working on making sure plus full listener is being properly utilized