Updating to listen 2.0