incorporated HttpResponse changes