anchor.diff:  		  service = FullSvcName,
   		  network_address = Address
   		 }),
  -    {reply, [ ok, FullSvcName ], State  };
  -
  -
  -handle_call({rvi_call, register_remote_services, [Services, Address] }, _From, State) ->
  +    {reply, [ ok, FullSvcName ], St  };
  +
  +
  +handle_call({rvi_call, register_remote_services, [Services, Address] }, _From, St) ->
       case Services of 
   	%% We have zero services associated with address.
   	%% Just register the address.
  
positive.code: 
      Services = RemoteSvc++LocalSvc,
  
      {reply,  [ok, Services], State };
  
  handle_call({rvi_call, get_remote_network_addresses, _Args}, _From, State) ->
      Addresses =  get_network_addresses_(?REMOTE_ADDRESS_TABLE),
      {reply, [ ok, Addresses ], State };
  
  
  handle_call({rvi_call, resolve_local_service, [RawService]}, _From, State) ->
      Service = rvi_common:sanitize_service_string(RawService),
      ?debug("service_discovery_rpc:resolve_local_service(): RawService:      ~p", [RawService]),
      ?debug("service_discovery_rpc:resolve_local_service(): Cleaned Service: ~p", [Service]),
  
      case resolve_service_(?LOCAL_SERVICE_TABLE, Service) of 
  	not_found ->
  	    { reply, [not_found], State };
  	
  	{ok, NetworkAddress } ->
  	    { reply, [ok, NetworkAddress], State}
      end;
  
  
  handle_call({rvi_call, get_local_services, _Args}, _From, State) ->
      Services = get_services_(?LOCAL_SERVICE_TABLE),
      {reply,  [ok,  Services ], State };
  
  handle_call({rvi_call, get_local_network_addresses, _Args}, _From, State) ->
      Addresses = get_network_addresses_(?LOCAL_SERVICE_TABLE),
      {reply, [ ok, Addresses ], State };
  
  handle_call(Other, _From, State) ->
      ?warning("service_discovery_rpc:handle_call(~p): unknown", [ Other ]),
      { reply,  [unknown_command] , State}.
  
  handle_cast(_Msg, State) ->
      {noreply, State}.
  
  handle_info(_Info, State) ->
      {noreply, State}.
  
  terminate(_Reason, _State) ->
      ok.
  code_change(_OldVsn, State, _Extra) ->
      {ok, State}.
  
  
  %%
  
negative.code: 	    service_edge_rpc:unregister_remote_services(SvcNames, lists:usort(LocalSvcAddresses))
  
      end,
      {reply, [ok], St };
  
  handle_call({rvi_call, unregister_remote_services_by_name, [Services]}, _From, St) ->
      unregister_remote_services_by_name_(Services),
      {reply, [ok], St };
  
  handle_call({rvi_call, unregister_local_service, [Service]}, _From, St) ->
      ?info("service_discovery_rpc:unregister_local_service(): ~p", 
  	  [Service]),
  
      ets:delete(?LOCAL_SERVICE_TABLE, Service),
      {reply, [ok], St };
  
  handle_call({rvi_call, resolve_remote_service, [RawService]}, _From, St) ->
      Service = rvi_common:sanitize_service_string(RawService),
      ?debug("service_discovery_rpc:resolve_remote_service(): RawService:      ~p", [RawService]),
      ?debug("service_discovery_rpc:resolve_remote_service(): Cleaned Service: ~p", [Service]),
      case resolve_service_(?REMOTE_SERVICE_TABLE, Service) of
  	{ok, NetworkAddress } ->
  	    {reply, [ok, NetworkAddress ], St};
  
  	not_found ->
  	    ?debug("service_discovery_rpc:resolve_remote_service(~p): Service not found in ets. "
  