diff --git a/cwFlowTypes.cpp b/cwFlowTypes.cpp
index 6109632..c6a9572 100644
--- a/cwFlowTypes.cpp
+++ b/cwFlowTypes.cpp
@@ -530,12 +530,12 @@ namespace cw
             {
               switch( net_val->tid )
               {
-                case kPolyPresetValueTId:
+                case kNetRefPresetValueTId:
                   _network_preset_print( net_val->u.npv.net_preset );
                   break;
                   
                 case kDirectPresetValueTId:
-                  cwLogPrint("    %s:%i %s:%i ch:%i ",cwStringNullGuard(net_val->u.pvv.proc->label),net_val->u.pvv.proc->label_sfx_id,cwStringNullGuard(net_val->u.pvv.var->label),net_val->u.pvv.var->label_sfx_id,net_val->u.pvv.var->chIdx);
+                  cwLogPrint("    %s:%i %s:%i ch:%i pidx:%i",cwStringNullGuard(net_val->u.pvv.proc->label),net_val->u.pvv.proc->label_sfx_id,cwStringNullGuard(net_val->u.pvv.var->label),net_val->u.pvv.var->label_sfx_id,net_val->u.pvv.var->chIdx,net_val->u.pvv.pairTblIdx);
                   value_print( &net_val->u.pvv.value );
                   cwLogPrint("\n");
                   break;
diff --git a/cwFlowTypes.h b/cwFlowTypes.h
index 2295cc8..9c697b3 100644
--- a/cwFlowTypes.h
+++ b/cwFlowTypes.h
@@ -151,16 +151,15 @@ namespace cw
       unsigned                 pairTblIdx; // Index into the preset pair table for this preset value
     } proc_var_value_t;
 
-    typedef struct net_preset_value_str
+    typedef struct net_preset_ref_str
     {
-      struct proc_str*          net_preset_proc; // net_preset_proc->internal_net has the preset list which net_preset is part of.
       struct network_str*       net_preset_net;  // poly net this preset will be applied to
       const network_preset_str* net_preset;      // network_preset_t of presets 
-    } poly_preset_value_t;
+    } net_preset_ref_t;
     
     typedef enum {
       kDirectPresetValueTId,
-      kPolyPresetValueTId,
+      kNetRefPresetValueTId,
     } preset_val_tid_t;
 
     
@@ -172,8 +171,8 @@ namespace cw
       
       union
       {
-        proc_var_value_t    pvv;  // Direct proc/var/value tuples.
-        poly_preset_value_t npv;  // Refers to a network_preset_t and a list of preset_values.
+        proc_var_value_t  pvv;  // Direct proc/var/value tuples.
+        net_preset_ref_t  npv;  // Refers to a network_preset_t and a list of preset_values.
       } u;
       
       struct preset_value_str* link;
@@ -243,8 +242,10 @@ namespace cw
       network_preset_pair_t* preset_pairA;
       unsigned               preset_pairN;
 
-      struct network_str* poly_link;
-      unsigned            poly_idx;
+      const proc_t*       owner_proc;  // The proc which owns this network (null for top level network)
+      unsigned            polyN;       // Count of networks in poly net or 1 if not part of a poly net
+      unsigned            poly_idx;    // Index in poly net or 0 if polyN == 1
+      struct network_str* poly_link;   // Link to next net in poly.
 
       ui_net_t* ui_net;