diff --git a/usb-c_cable_tester.lht b/usb-c_cable_tester.lht
index 9d97fd2..87fed08 100644
--- a/usb-c_cable_tester.lht
+++ b/usb-c_cable_tester.lht
@@ -4851,312 +4851,6 @@ ha:pcb-rnd-board-v8 {
         }
          uid = fNBhogi9RvPCwmAkAQYAAAAn
         }
-          ha:subc.25953 {
-           ha:attributes {
-            value=CR1220
-            footprint=CONNECTOR_MY-1220-03.lht
-            refdes=B1
-           }
-          ha:data {
-                    li:padstack_prototypes {
-
-           ha:ps_proto_v6.0 {
-             hdia=0.0; hplated=0; htop=0; hbottom=0;
-             li:shape {
-
-               ha:ps_shape_v4 {
-                ha:combining {                }
-                ha:layer_mask {
-                 copper = 1
-                 top = 1
-                }
-                clearance=0.2mm
-                 li:ps_poly {
-                  -1.95mm  
-                  -2.1mm  
-                  1.95mm  
-                  -2.1mm  
-                  1.95mm  
-                  2.1mm  
-                  -1.95mm  
-                  2.1mm  
-                 }
-               }
-
-               ha:ps_shape_v4 {
-                ha:combining { sub=1; auto=1;                }
-                ha:layer_mask {
-                 top = 1
-                 mask = 1
-                }
-                clearance=0.0
-                 li:ps_poly {
-                  -2.0mm  
-                  -2.15mm  
-                  2.0mm  
-                  -2.15mm  
-                  2.0mm  
-                  2.15mm  
-                  -2.0mm  
-                  2.15mm  
-                 }
-               }
-
-               ha:ps_shape_v4 {
-                ha:combining { auto=1;                }
-                ha:layer_mask {
-                 top = 1
-                 paste = 1
-                }
-                clearance=0.0
-                 li:ps_poly {
-                  -1.95mm  
-                  -2.1mm  
-                  1.95mm  
-                  -2.1mm  
-                  1.95mm  
-                  2.1mm  
-                  -1.95mm  
-                  2.1mm  
-                 }
-               }
-             }
-           }
-
-           ha:ps_proto_v6.1 {
-             hdia=0.0; hplated=0; htop=0; hbottom=0;
-             li:shape {
-
-               ha:ps_shape_v4 {
-                ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;                }
-                ha:combining {                }
-                ha:layer_mask {
-                 copper = 1
-                 top = 1
-                }
-                clearance=0.2mm
-               }
-
-               ha:ps_shape_v4 {
-                ha:ps_circ { x=0.0; y=0.0; dia=9.05mm;                }
-                ha:combining { sub=1; auto=1;                }
-                ha:layer_mask {
-                 top = 1
-                 mask = 1
-                }
-                clearance=0.0
-               }
-
-               ha:ps_shape_v4 {
-                ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;                }
-                ha:combining { auto=1;                }
-                ha:layer_mask {
-                 top = 1
-                 paste = 1
-                }
-                clearance=0.0
-               }
-             }
-           }
-          }
-
-           li:objects {
-            ha:padstack_ref.26013 {
-             proto=0; x=46.0mm; y=11.95mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-             ha:flags {
-              clearline=1
-             }
-
-             li:thermal {
-             }
-
-             ha:attributes {
-               term=1
-               name=1
-             }
-            }
-            ha:padstack_ref.26014 {
-             proto=0; x=46.0mm; y=27.05mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-             ha:flags {
-              clearline=1
-             }
-
-             li:thermal {
-             }
-
-             ha:attributes {
-               term=2
-               name=2
-             }
-            }
-            ha:padstack_ref.26015 {
-             proto=1; x=46.0mm; y=19.5mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-             ha:flags {
-              clearline=1
-             }
-
-             li:thermal {
-               li:2 {
-                on  
-                diag  
-                round  
-                noshape  
-               }
-             }
-
-             ha:attributes {
-               term=3
-               name=3
-             }
-            }
-           }
-           li:layers {
-
-            ha:subc-aux {
-             lid=0
-             ha:combining {             }
-
-              li:objects {
-               ha:line.25954 {
-                x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
-                ha:attributes {
-                  subc-role=origin
-                }
-               }
-               ha:line.25957 {
-                x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
-                ha:attributes {
-                  subc-role=x
-                }
-               }
-               ha:line.25960 {
-                x1=46.0mm; y1=19.5mm; x2=45.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
-                ha:attributes {
-                  subc-role=y
-                }
-               }
-               ha:line.25963 {
-                x1=45.1mm; y1=19.5mm; x2=45.1mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
-                ha:attributes {
-                  subc-role=pnp-origin
-                }
-               }
-              }
-              ha:type {
-               top = 1
-               misc = 1
-               virtual = 1
-              }
-            }
-
-            ha:top-silkscreen {
-             lid=1
-             ha:combining {             }
-
-              li:objects {
-               ha:line.25966 {
-                x1=42.1mm; y1=12.9mm; x2=39.1mm; y2=15.9mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25969 {
-                x1=39.1mm; y1=15.9mm; x2=39.1mm; y2=23.1mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25972 {
-                x1=39.1mm; y1=23.1mm; x2=42.1mm; y2=26.1mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25975 {
-                x1=51.2mm; y1=12.8mm; x2=51.2mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25978 {
-                x1=51.2mm; y1=26.2mm; x2=48.4mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25981 {
-                x1=43.6mm; y1=26.2mm; x2=39.0mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25984 {
-                x1=39.0mm; y1=26.2mm; x2=39.0mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25987 {
-                x1=51.2mm; y1=12.8mm; x2=48.4mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
-               }
-               ha:line.25990 {
-                x1=43.6mm; y1=12.8mm; x2=39.0mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
-               }
-              }
-              ha:type {
-               silk = 1
-               top = 1
-              }
-            }
-
-            ha:top-assembly {
-             lid=2
-             ha:combining {             }
-
-              li:objects {
-               ha:line.25993 {
-                x1=45.1mm; y1=18.8mm; x2=45.1mm; y2=20.2mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:line.25996 {
-                x1=1.80314961in; y1=19.5mm; x2=44.4mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:line.25999 {
-                x1=51.1mm; y1=12.9mm; x2=51.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:line.26002 {
-                x1=51.1mm; y1=26.1mm; x2=39.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:line.26005 {
-                x1=39.1mm; y1=26.1mm; x2=39.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:line.26008 {
-                x1=39.1mm; y1=12.9mm; x2=51.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
-               }
-               ha:arc.26011 {
-                x=45.1mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
-               }
-               ha:text.26012 {
-                string=%a.parent.refdes%; x=42.8mm; y=18.8mm; scale=100; fid=0;
-                ha:flags {
-                 dyntext=1
-                 floater=1
-                }
-                rot = 360.000000
-               }
-              }
-              ha:type {
-               top = 1
-               doc = 1
-              }
-              purpose = assy
-            }
-
-            ha:top-courtyard {
-             lid=3
-             ha:combining {             }
-
-              li:objects {
-               ha:polygon.26016 {
-                li:geometry {
-                  ta:contour {
-                   { 51.35mm; 9.75mm }
-                   { 51.35mm; 29.25mm }
-                   { 38.85mm; 29.25mm }
-                   { 38.85mm; 9.75mm }
-                  }
-                }
-
-               }
-              }
-              ha:type {
-               top = 1
-               doc = 1
-              }
-              purpose = ko.courtyard
-            }
-           }
-          }
-           uid = AQV3WupyorPasUcZHO0AAAAZ
-          }
          ha:subc.8328 {
           ha:attributes {
            value=
@@ -7363,6 +7057,447 @@ ha:pcb-rnd-board-v8 {
              }
               uid = 3eczefajy7hoyiiSAgcAAAAe
              }
+              ha:subc.115684 {
+               ha:attributes {
+                value=CR1220
+                footprint=CONNECTOR_MY-1220-03.lht
+                refdes=B1
+               }
+              ha:data {
+                            li:padstack_prototypes {
+
+               ha:ps_proto_v6.0 {
+                 hdia=0.0; hplated=0; htop=0; hbottom=0;
+                 li:shape {
+
+                   ha:ps_shape_v4 {
+                    ha:combining {                    }
+                    ha:layer_mask {
+                     copper = 1
+                     top = 1
+                    }
+                    clearance=0.2mm
+                     li:ps_poly {
+                      -1.95mm  
+                      -2.1mm  
+                      1.95mm  
+                      -2.1mm  
+                      1.95mm  
+                      2.1mm  
+                      -1.95mm  
+                      2.1mm  
+                     }
+                   }
+
+                   ha:ps_shape_v4 {
+                    ha:combining { sub=1; auto=1;                    }
+                    ha:layer_mask {
+                     top = 1
+                     mask = 1
+                    }
+                    clearance=0.0
+                     li:ps_poly {
+                      -2.0mm  
+                      -2.15mm  
+                      2.0mm  
+                      -2.15mm  
+                      2.0mm  
+                      2.15mm  
+                      -2.0mm  
+                      2.15mm  
+                     }
+                   }
+
+                   ha:ps_shape_v4 {
+                    ha:combining { auto=1;                    }
+                    ha:layer_mask {
+                     top = 1
+                     paste = 1
+                    }
+                    clearance=0.0
+                     li:ps_poly {
+                      -1.95mm  
+                      -2.1mm  
+                      1.95mm  
+                      -2.1mm  
+                      1.95mm  
+                      2.1mm  
+                      -1.95mm  
+                      2.1mm  
+                     }
+                   }
+                 }
+               }
+
+               ha:ps_proto_v6.1 {
+                 hdia=0.0; hplated=0; htop=0; hbottom=0;
+                 li:shape {
+
+                   ha:ps_shape_v4 {
+                    ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;                    }
+                    ha:combining {                    }
+                    ha:layer_mask {
+                     copper = 1
+                     top = 1
+                    }
+                    clearance=0.2mm
+                   }
+
+                   ha:ps_shape_v4 {
+                    ha:ps_circ { x=0.0; y=0.0; dia=9.05mm;                    }
+                    ha:combining { sub=1; auto=1;                    }
+                    ha:layer_mask {
+                     top = 1
+                     mask = 1
+                    }
+                    clearance=0.0
+                   }
+
+                   ha:ps_shape_v4 {
+                    ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;                    }
+                    ha:combining { auto=1;                    }
+                    ha:layer_mask {
+                     top = 1
+                     paste = 1
+                    }
+                    clearance=0.0
+                   }
+                 }
+               }
+              }
+
+               li:objects {
+                ha:padstack_ref.115747 {
+                 proto=0; x=46.0mm; y=11.95mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+                 ha:flags {
+                  clearline=1
+                 }
+
+                 li:thermal {
+                 }
+
+                 ha:attributes {
+                   term=1
+                   name=1
+                 }
+                }
+                ha:padstack_ref.115748 {
+                 proto=0; x=46.0mm; y=27.05mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+                 ha:flags {
+                  clearline=1
+                 }
+
+                 li:thermal {
+                 }
+
+                 ha:attributes {
+                   term=2
+                   name=2
+                 }
+                }
+                ha:padstack_ref.115749 {
+                 proto=1; x=46.0mm; y=19.5mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+                 ha:flags {
+                  clearline=1
+                 }
+
+                 li:thermal {
+                   li:2 {
+                    on  
+                    diag  
+                    round  
+                    noshape  
+                   }
+                 }
+
+                 ha:attributes {
+                   term=3
+                   name=3
+                 }
+                }
+               }
+               li:layers {
+
+                ha:subc-aux {
+                 lid=0
+                 ha:combining {                 }
+
+                  li:objects {
+                   ha:line.115685 {
+                    x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=origin
+                    }
+                   }
+                   ha:line.115688 {
+                    x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=x
+                    }
+                   }
+                   ha:line.115691 {
+                    x1=46.0mm; y1=19.5mm; x2=45.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=y
+                    }
+                   }
+                   ha:line.115694 {
+                    x1=45.1mm; y1=19.5mm; x2=45.1mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=pnp-origin
+                    }
+                   }
+                  }
+                  ha:type {
+                   top = 1
+                   misc = 1
+                   virtual = 1
+                  }
+                }
+
+                ha:top-silkscreen {
+                 lid=1
+                 ha:combining {                 }
+
+                  li:objects {
+                   ha:line.115697 {
+                    x1=42.1mm; y1=12.9mm; x2=39.1mm; y2=15.9mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115700 {
+                    x1=39.1mm; y1=15.9mm; x2=39.1mm; y2=23.1mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115703 {
+                    x1=39.1mm; y1=23.1mm; x2=42.1mm; y2=26.1mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115706 {
+                    x1=51.2mm; y1=12.8mm; x2=51.2mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115709 {
+                    x1=51.2mm; y1=26.2mm; x2=48.4mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115712 {
+                    x1=43.6mm; y1=26.2mm; x2=42.2mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115715 {
+                    x1=51.2mm; y1=12.8mm; x2=48.4mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115718 {
+                    x1=43.6mm; y1=12.8mm; x2=42.2mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115721 {
+                    x1=42.2mm; y1=12.8mm; x2=42.1mm; y2=12.9mm; thickness=0.2mm; clearance=0.0;
+                   }
+                   ha:line.115724 {
+                    x1=42.2mm; y1=26.2mm; x2=42.1mm; y2=26.1mm; thickness=0.2mm; clearance=0.0;
+                   }
+                  }
+                  ha:type {
+                   silk = 1
+                   top = 1
+                  }
+                }
+
+                ha:top-assembly {
+                 lid=2
+                 ha:combining {                 }
+
+                  li:objects {
+                   ha:line.115727 {
+                    x1=45.1mm; y1=18.8mm; x2=45.1mm; y2=20.2mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:line.115730 {
+                    x1=1.80314961in; y1=19.5mm; x2=44.4mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:line.115733 {
+                    x1=51.1mm; y1=12.9mm; x2=51.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:line.115736 {
+                    x1=51.1mm; y1=26.1mm; x2=39.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:line.115739 {
+                    x1=39.1mm; y1=26.1mm; x2=39.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:line.115742 {
+                    x1=39.1mm; y1=12.9mm; x2=51.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:arc.115745 {
+                    x=45.1mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+                   }
+                   ha:text.115746 {
+                    string=%a.parent.refdes%; x=42.8mm; y=18.8mm; scale=100; fid=0;
+                    ha:flags {
+                     dyntext=1
+                     floater=1
+                    }
+                    rot = 360.000000
+                   }
+                  }
+                  ha:type {
+                   top = 1
+                   doc = 1
+                  }
+                  purpose = assy
+                }
+
+                ha:top-courtyard {
+                 lid=3
+                 ha:combining {                 }
+
+                  li:objects {
+                   ha:polygon.115750 {
+                    li:geometry {
+                      ta:contour {
+                       { 51.35mm; 9.75mm }
+                       { 51.35mm; 29.25mm }
+                       { 38.85mm; 29.25mm }
+                       { 38.85mm; 9.75mm }
+                      }
+                    }
+                   }
+                  }
+                  ha:type {
+                   top = 1
+                   doc = 1
+                  }
+                  purpose = ko.courtyard
+                }
+
+                ha:top_paste {
+                 lid=4
+                 ha:combining { auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   top = 1
+                   paste = 1
+                  }
+                }
+
+                ha:top_mask {
+                 lid=5
+                 ha:combining { sub=1; auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   top = 1
+                   mask = 1
+                  }
+                }
+
+                ha:top_copper {
+                 lid=6
+                 ha:combining {                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   copper = 1
+                   top = 1
+                  }
+                }
+
+                ha:any_internal_copper {
+                 lid=7
+                 ha:combining {                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   copper = 1
+                   intern = 1
+                  }
+                  stack_offs = 1
+                }
+
+                ha:bottom_copper {
+                 lid=8
+                 ha:combining {                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   bottom = 1
+                   copper = 1
+                  }
+                }
+
+                ha:bottom_mask {
+                 lid=9
+                 ha:combining { sub=1; auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   bottom = 1
+                   mask = 1
+                  }
+                }
+
+                ha:bottom_silk {
+                 lid=10
+                 ha:combining { auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   silk = 1
+                   bottom = 1
+                  }
+                }
+
+                ha:bottom_paste {
+                 lid=11
+                 ha:combining { auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   bottom = 1
+                   paste = 1
+                  }
+                }
+
+                ha:outline {
+                 lid=12
+                 ha:combining {                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   boundary = 1
+                  }
+                  purpose = uroute
+                }
+
+                ha:pmech {
+                 lid=13
+                 ha:combining { auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   mech = 1
+                  }
+                  purpose = proute
+                }
+
+                ha:umech {
+                 lid=14
+                 ha:combining { auto=1;                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   mech = 1
+                  }
+                  purpose = uroute
+                }
+               }
+              }
+               uid = AQV3WupyorPasUcZHO0AAAAZ
+              }
    }
    li:layers {
 
@@ -8413,7 +8548,6 @@ ha:pcb-rnd-board-v8 {
         x1=14.5mm; y1=7.0mm; x2=14.5mm; y2=32.0mm; thickness=0.1mm; clearance=0.2mm;
         ha:flags {
          clearline=1
-         selected=1
         }
        }
        ha:line.12385 {