added more response improvements