-- Fixed the Service
-- Added Client