changes according to the new service response