improved response matching, not backwards compatible!