corrected client and service