improved response management