continued refinements.    switching services over to utilize calls to the server