Modified return so the complete response is returned