anchor.diff:                      {DoFB, [entry_to_kvv(Entry) | FBItems]};
                   true -> FB
               end,
  +    NewState = State#rr_resolve_state{ stats = NewStats, feedback = NewFB },
       if
           (Diff -1) =:= (RegenOk + UpdOk + UpdFail + RegenFail) ->
                   ?TRACE("UPDATED = ~p - Regen=~p - FB=~p", [Stats#resolve_stats.update_count, Stats#resolve_stats.regen_count, NewFB], State),
                   send_feedback(NewFB, Stats#resolve_stats.session_id),
  -                comm:send_local(self(), {shutdown, resolve_ok});
  -        true -> ok
  -    end,
  -    State#rr_resolve_state{ stats = NewStats, feedback = NewFB };
  -
  -on({shutdown, _}, #rr_resolve_state{ ownerPid = Owner,
  -                                     send_stats = SendStats,
  -                                     stats = Stats }) ->
  -    send_stats(SendStats, Stats),
  -    comm:send_local(Owner, {resolve_progress_report, self(), Stats}),
  -    kill.
  +                shutdown(resolve_ok, NewState);
  +        true -> NewState
  +    end;
  +
  +on({shutdown, Reason}, State) ->
  +    shutdown(Reason, State).
   
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
  
positive.code:     % internal
      {get_state_response, intervals:interval()} |
      {update_key_entry_ack, db_entry:entry(), Exists::boolean(), Done::boolean()} |
      {shutdown, atom()}.
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  % debug
  
negative.code:                           }) ->
      ToUpdate = start_update_key_entry(KvvList, MyI, comm:this(), DhtPid),
      ?TRACE("GET INTERVAL - KEY UPD - KVVListLen=~p ; ToUpdate=~p", [length(KvvList), ToUpdate], State),
      NewState = State#rr_resolve_state{stats = Stats#resolve_stats{diff_size = ToUpdate}},
      if ToUpdate =:= 0 -> shutdown(resolve_ok, NewState);
         true           -> NewState % note: shutdown handled by update_key_entry_ack
      end;
  
  on({get_state_response, MyI}, State =
         #rr_resolve_state{ operation = {key_upd_send, _, KeyList},
  