More changes to response

Yet another set of changes...