Updated listener to shorten responses