Response handling changed

Response handling changed