did some work to streamline responses