diff --git a/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts b/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts
index 48b46c90..bda85335 100644
--- a/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts
+++ b/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts
@@ -74,7 +74,16 @@ export class MspConnectionPairSolver extends BaseSolver {
       }
     }
 
-    this.queuedDcNetIds = Object.keys(netConnMap.netMap)
+    // Queue all direct-wire nets from dcConnMap plus any nets that exist only in
+    // globalConnMap (net-label-only nets such as GND shared via netConnections).
+    // Because directConnMap and netConnMap now have independent netMap arrays (deep
+    // clone in getConnectivityMapsFromInputProblem), net-label pins that happen to
+    // share a name with a direct-wire pin are NOT merged into the direct-wire net.
+    const directNetIds = new Set(Object.keys(directConnMap.netMap))
+    const netLabelOnlyNetIds = Object.keys(netConnMap.netMap).filter(
+      (id) => !directNetIds.has(id),
+    )
+    this.queuedDcNetIds = [...directNetIds, ...netLabelOnlyNetIds]
   }
 
   override getConstructorParams(): ConstructorParameters<
@@ -93,7 +102,14 @@ export class MspConnectionPairSolver extends BaseSolver {
 
     const dcNetId = this.queuedDcNetIds.shift()!
 
-    const allIds = this.globalConnMap.getIdsConnectedToNet(dcNetId) as string[]
+    // For direct-wire nets use dcConnMap so that net-label-only pins merged into
+    // the same global net are not included in wire routing.  For net-label-only
+    // nets (not present in dcConnMap) fall back to globalConnMap.
+    const dcIds = this.dcConnMap.getIdsConnectedToNet(dcNetId) as string[]
+    const allIds =
+      dcIds.length > 0
+        ? dcIds
+        : (this.globalConnMap.getIdsConnectedToNet(dcNetId) as string[])
     const directlyConnectedPins = allIds.filter((id) => !!this.pinMap[id])
 
     if (directlyConnectedPins.length <= 1) {
diff --git a/lib/solvers/MspConnectionPairSolver/getConnectivityMapFromInputProblem.ts b/lib/solvers/MspConnectionPairSolver/getConnectivityMapFromInputProblem.ts
index d3a098c3..0fe8fde1 100644
--- a/lib/solvers/MspConnectionPairSolver/getConnectivityMapFromInputProblem.ts
+++ b/lib/solvers/MspConnectionPairSolver/getConnectivityMapFromInputProblem.ts
@@ -14,7 +14,12 @@ export const getConnectivityMapsFromInputProblem = (
     ])
   }
 
-  const netConnMap = new ConnectivityMap(directConnMap.netMap)
+  // Deep-clone each array so that mutations in netConnMap (e.g. merging net-label
+  // pins into an existing direct-wire net) do NOT corrupt directConnMap.
+  const clonedNetMap = Object.fromEntries(
+    Object.entries(directConnMap.netMap).map(([k, v]) => [k, [...v]]),
+  )
+  const netConnMap = new ConnectivityMap(clonedNetMap)
 
   for (const netConn of inputProblem.netConnections) {
     netConnMap.addConnections([[netConn.netId, ...netConn.pinIds]])
diff --git a/tests/examples/__snapshots__/example07.snap.svg b/tests/examples/__snapshots__/example07.snap.svg
index 7098ddac..91ca6743 100644
--- a/tests/examples/__snapshots__/example07.snap.svg
+++ b/tests/examples/__snapshots__/example07.snap.svg
@@ -50,7 +50,7 @@ y-" data-x="1.757519574999999" data-y="1.2" cx="547.3539750075635" cy="270.41751
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.8574283249999997" data-y="0.7512093000000004" cx="124.4370028081066" cy="322.9220591216218" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-2.3148566499999994" data-y="0.7512093000000004" cx="70.92192940766586" cy="322.9220591216218" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
@@ -114,10 +114,7 @@ orientation: x+" data-x="1.757519574999999" data-y="0.85" cx="547.3539750075635"
     <polyline data-points="1.4,0.5 1.757519574999999,1.2" data-type="line" data-label="" points="505.5273428281519,352.31132820191624 547.3539750075635,270.4175115470151" fill="none" stroke="hsl(304, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 -1.8574283249999997,0.42500000000000004 -1.8574283249999997,0.7512093000000004 -2.3148566499999994,0.7512093000000004 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="177.95207620854734,361.0856657006556 124.4370028081066,361.0856657006556 124.4370028081066,322.9220591216218 70.92192940766586,322.9220591216218 70.92192940766586,346.32029245159356" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="1.4,-0.5 1.5999999999999999,-0.5 1.5999999999999999,-0.3 1.4,-0.3" data-type="line" data-label="" points="505.5273428281519,469.302494851775 528.9255761581237,469.302494851775 528.9255761581237,445.9042615218033 505.5273428281519,445.9042615218033" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.3148566499999994,0.5512093000000002 -2.3148566499999994,0.7512093000000004 -1.8574283249999997,0.7512093000000004 -1.8574283249999997,0.42500000000000004 -1.4,0.42500000000000004" data-type="line" data-label="" points="70.92192940766586,346.32029245159356 70.92192940766586,322.9220591216218 124.4370028081066,322.9220591216218 124.4370028081066,361.0856657006556 177.95207620854734,361.0856657006556" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="-2.31430995,-0.5512093000000002 -2.31430995,-0.7512093000000004 -1.857154975,-0.7512093000000004 -1.857154975,-0.42500000000000004 -1.4,-0.42500000000000004" data-type="line" data-label="" points="70.98588847847327,475.2935306020977 70.98588847847327,498.6917639320694 124.4689823435103,498.6917639320694 124.4689823435103,460.5281573530356 177.95207620854734,460.5281573530356" fill="none" stroke="purple" stroke-width="1" />
@@ -125,6 +122,9 @@ orientation: x+" data-x="1.757519574999999" data-y="0.85" cx="547.3539750075635"
   <g>
     <polyline data-points="1.757519574999999,1.2 1.757519574999999,0.5 1.4,0.5" data-type="line" data-label="" points="547.3539750075635,270.4175115470151 547.3539750075635,352.31132820191624 505.5273428281519,352.31132820191624" fill="none" stroke="purple" stroke-width="1" />
   </g>
+  <g>
+    <polyline data-points="1.4,-0.3 1.5999999999999999,-0.3 1.5999999999999999,-0.5 1.4,-0.5" data-type="line" data-label="" points="505.5273428281519,445.9042615218033 528.9255761581237,445.9042615218033 528.9255761581237,469.302494851775 505.5273428281519,469.302494851775" fill="none" stroke="purple" stroke-width="1" />
+  </g>
   <g>
     <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="177.95207620854734" y="328.9130948719445" width="327.5752666196046" height="163.78763330980223" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.00854765388392857" />
   </g>
@@ -137,7 +137,7 @@ orientation: x+" data-x="1.757519574999999" data-y="0.85" cx="547.3539750075635"
   <g>
     <rect data-type="rect" data-label="netId: V3_3
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="-1.8574283249999997" data-y="0.9762093000000004" x="112.7378861431207" y="270.2760341291854" width="23.398233329971788" height="52.64602499243642" fill="#ef444466" stroke="#ef4444" stroke-width="0.00854765388392857" />
+available orientations: y+" data-x="-2.3148566499999994" data-y="0.9762093000000004" x="59.22281274267999" y="270.2760341291854" width="23.398233329971788" height="52.64602499243642" fill="#ef444466" stroke="#ef4444" stroke-width="0.00854765388392857" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V3_3
diff --git a/tests/examples/__snapshots__/example13.snap.svg b/tests/examples/__snapshots__/example13.snap.svg
index 3fe23640..6db16e22 100644
--- a/tests/examples/__snapshots__/example13.snap.svg
+++ b/tests/examples/__snapshots__/example13.snap.svg
@@ -98,7 +98,11 @@ orientation: y+" data-x="-2.125" data-y="0" cx="152.1300058038305" cy="352.50145
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-3.75" data-y="2" cx="46.500290191526375" cy="222.49564712710392" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-3.75" data-y="1.125" cx="46.500290191526375" cy="279.37318630296" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="-3.651" data-y="2.201" cx="52.93557748113753" cy="209.43006384213584" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
@@ -193,10 +197,7 @@ orientation: y+" data-x="1.96375" data-y="3" cx="417.91062100986653" cy="157.492
     <polyline data-points="-3.55,2 2.45,0" data-type="line" data-label="" points="59.50087057457921,222.49564712710392 449.5182820661637,352.5014509576321" fill="none" stroke="hsl(105, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-3.55,2 -3.75,2 -3.75,1.125 -1.1500000000000004,1.125" data-type="line" data-label="" points="59.50087057457921,222.49564712710392 46.500290191526375,222.49564712710392 46.500290191526375,279.37318630296 215.50783517121295,279.37318630296" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="-3.55,0 -3.75,0 -3.75,2 -3.55,2" data-type="line" data-label="" points="59.50087057457921,352.5014509576321 46.500290191526375,352.5014509576321 46.500290191526375,222.49564712710392 59.50087057457921,222.49564712710392" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-3.55,0 -3.75,0 -3.75,1.125 -1.1500000000000004,1.125" data-type="line" data-label="" points="59.50087057457921,352.5014509576321 46.500290191526375,352.5014509576321 46.500290191526375,279.37318630296 215.50783517121295,279.37318630296" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="-2.45,0 -1.8,0 -1.8,0.375 -1.15,0.375" data-type="line" data-label="" points="131.00406268136967,352.5014509576321 173.25594892629132,352.5014509576321 173.25594892629132,328.12536273940805 215.507835171213,328.12536273940805" fill="none" stroke="purple" stroke-width="1" />
@@ -225,6 +226,9 @@ orientation: y+" data-x="1.96375" data-y="3" cx="417.91062100986653" cy="157.492
   <g>
     <polyline data-points="-1.15,-1.125 -1.301,-1.125 -1.301,-1.074" data-type="line" data-label="" points="215.507835171213,425.62971561230415 205.69239698200812,425.62971561230415 205.69239698200812,422.31456761462573" fill="none" stroke="purple" stroke-width="1" />
   </g>
+  <g>
+    <polyline data-points="-3.55,2 -3.651,2 -3.651,2.201" data-type="line" data-label="" points="59.50087057457921,222.49564712710392 52.93557748113753,222.49564712710392 52.93557748113753,209.43006384213584" fill="none" stroke="purple" stroke-width="1" />
+  </g>
   <g>
     <polyline data-points="2.45,0 2.2990000000000004,0 2.2990000000000004,0.051000000000000004" data-type="line" data-label="" points="449.5182820661637,352.5014509576321 439.7028438769588,352.5014509576321 439.7028438769588,349.1863029599536" fill="none" stroke="purple" stroke-width="1" />
   </g>
@@ -277,7 +281,12 @@ available orientations: any" data-x="-2.125" data-y="0.225" x="145.6297156123041
   <g>
     <rect data-type="rect" data-label="netId: v3_3
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="-3.75" data-y="2.225" x="39.99999999999997" y="193.24434126523508" width="13.000580383052835" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
+available orientations: y+" data-x="-3.75" data-y="1.35" x="39.99999999999997" y="250.12188044109115" width="13.000580383052835" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: v3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="-3.651" data-y="2.426" x="46.435287289611125" y="180.178757980267" width="13.000580383052835" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: v3_3
diff --git a/tests/examples/__snapshots__/example15.snap.svg b/tests/examples/__snapshots__/example15.snap.svg
index 5d1b2f9d..0f375cea 100644
--- a/tests/examples/__snapshots__/example15.snap.svg
+++ b/tests/examples/__snapshots__/example15.snap.svg
@@ -322,7 +322,27 @@ orientation: y+" data-x="-1.3099999999999998" data-y="1.2000000000000015" cx="35
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="0.29250000000000076" data-y="6.705000000000002" cx="432.8137384412153" cy="62.19286657859976" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-1.5675" data-y="6.705000000000002" cx="341.08322324966974" cy="62.19286657859976" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="-1.4109999999999998" data-y="0.7010000000000011" cx="348.8014090708939" cy="358.2950242184059" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="-2.4975" data-y="6.505000000000002" cx="295.21796565389695" cy="72.05636283575518" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="0.29250000000000037" data-y="6.705000000000002" cx="432.8137384412153" cy="62.19286657859976" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="-1.511" data-y="1.151000000000001" cx="343.86966094231616" cy="336.1021576398062" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="2.1525000000000007" data-y="6.505000000000002" cx="524.5442536327608" cy="72.05636283575518" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
@@ -330,7 +350,11 @@ orientation: y+" data-x="-1.3099999999999998" data-y="2.8000000000000016" cx="35
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-3.7550000000000003" data-y="3.9683333333333355" cx="233.2012329370322" cy="197.15837369734325" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-4.6850000000000005" data-y="3.9683333333333355" cx="187.3359753412594" cy="197.15837369734325" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="anchorPoint
+orientation: y+" data-x="-6.415" data-y="3.7683333333333353" cx="102.01673271686491" cy="207.0218699544987" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
@@ -776,73 +800,61 @@ orientation: y-" data-x="-2.49" data-y="-2.9000000000000004" cx="295.58784676354
     <polyline data-points="-2.025,0.900000000000001 -2.025,-2.7" data-type="line" data-label="" points="318.5204755614267,348.48084544253624 318.5204755614267,526.0237780713342" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-0.6375000000000002,6.505000000000002 -0.6375000000000002,6.705000000000002 -1.5675,6.705000000000002 -1.5675,6.505000000000002" data-type="line" data-label="" points="386.94848084544253,72.05636283575518 386.94848084544253,62.19286657859976 341.08322324966974,62.19286657859976 341.08322324966974,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="0.29250000000000076,6.505000000000002 0.29250000000000076,6.705000000000002 -0.6374999999999998,6.705000000000002 -0.6374999999999998,6.505000000000002" data-type="line" data-label="" points="432.8137384412153,72.05636283575518 432.8137384412153,62.19286657859976 386.94848084544253,62.19286657859976 386.94848084544253,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="1.222500000000001,6.505000000000002 1.222500000000001,6.705000000000002 0.29250000000000037,6.705000000000002 0.29250000000000037,6.505000000000002" data-type="line" data-label="" points="478.6789960369881,72.05636283575518 478.6789960369881,62.19286657859976 432.8137384412153,62.19286657859976 432.8137384412153,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="2.152500000000001,6.505000000000002 2.152500000000001,6.705000000000002 1.2225000000000006,6.705000000000002 1.2225000000000006,6.505000000000002" data-type="line" data-label="" points="524.5442536327608,72.05636283575518 524.5442536327608,62.19286657859976 478.6789960369881,62.19286657859976 478.6789960369881,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="-2.4975,6.505000000000002 -2.4975,6.705000000000002 -1.5674999999999994,6.705000000000002 -1.5674999999999994,6.505000000000002" data-type="line" data-label="" points="295.21796565389695,72.05636283575518 295.21796565389695,62.19286657859976 341.0832232496698,62.19286657859976 341.0832232496698,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.025,2.000000000000001 -2.025,2.200000000000001 -1.3099999999999998,2.200000000000001 -1.3099999999999998,2.0000000000000018 -1.1099999999999999,2.0000000000000018" data-type="line" data-label="" points="318.5204755614267,294.2316160281814 318.5204755614267,284.36811977102593 353.7824746807574,284.36811977102593 353.7824746807574,294.23161602818135 363.6459709379128,294.23161602818135" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,1.0000000000000013 -1.3099999999999998,1.0000000000000013 -1.3099999999999998,1.2000000000000015 -1.1099999999999999,1.2000000000000015" data-type="line" data-label="" points="363.6459709379128,343.54909731395855 353.7824746807574,343.54909731395855 353.7824746807574,333.6856010568031 363.6459709379128,333.6856010568031" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.025,-1.6000000000000003 -2.025,-1.4000000000000004 -1.3099999999999998,-1.4000000000000004 -1.3099999999999998,-1.6000000000000008 -1.1099999999999997,-1.6000000000000008" data-type="line" data-label="" points="318.5204755614267,471.7745486569793 318.5204755614267,461.9110523998238 353.7824746807574,461.9110523998238 353.7824746807574,471.7745486569793 363.6459709379128,471.7745486569793" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,0.8000000000000012 -1.3099999999999998,0.8000000000000012 -1.3099999999999998,1.0000000000000013 -1.1099999999999999,1.0000000000000013" data-type="line" data-label="" points="363.6459709379128,353.412593571114 353.7824746807574,353.412593571114 353.7824746807574,343.54909731395855 363.6459709379128,343.54909731395855" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-0.6375000000000002,5.405000000000002 -0.6375000000000002,5.205000000000002 -1.5675,5.205000000000002 -1.5675,5.405000000000002" data-type="line" data-label="" points="386.94848084544253,126.30559225011007 386.94848084544253,136.16908850726549 341.08322324966974,136.16908850726549 341.08322324966974,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,0.600000000000001 -1.3099999999999998,0.600000000000001 -1.3099999999999998,0.8000000000000012 -1.1099999999999999,0.8000000000000012" data-type="line" data-label="" points="363.6459709379128,363.2760898282694 353.7824746807574,363.2760898282694 353.7824746807574,353.412593571114 363.6459709379128,353.412593571114" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.4975,5.405000000000002 -2.4975,5.205000000000002 -1.5674999999999994,5.205000000000002 -1.5674999999999994,5.405000000000002" data-type="line" data-label="" points="295.21796565389695,126.30559225011007 295.21796565389695,136.16908850726549 341.0832232496698,136.16908850726549 341.0832232496698,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,0.4000000000000008 -1.3099999999999998,0.4000000000000008 -1.3099999999999998,0.600000000000001 -1.1099999999999999,0.600000000000001" data-type="line" data-label="" points="363.6459709379128,373.13958608542487 353.7824746807574,373.13958608542487 353.7824746807574,363.2760898282694 363.6459709379128,363.2760898282694" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="0.29250000000000076,5.405000000000002 0.29250000000000076,5.205000000000002 -0.6374999999999998,5.205000000000002 -0.6374999999999998,5.405000000000002" data-type="line" data-label="" points="432.8137384412153,126.30559225011007 432.8137384412153,136.16908850726549 386.94848084544253,136.16908850726549 386.94848084544253,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,0.20000000000000062 -1.3099999999999998,0.20000000000000062 -1.3099999999999998,0.4000000000000008 -1.1099999999999999,0.4000000000000008" data-type="line" data-label="" points="363.6459709379128,383.0030823425803 353.7824746807574,383.0030823425803 353.7824746807574,373.13958608542487 363.6459709379128,373.13958608542487" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.222500000000001,5.405000000000002 1.222500000000001,5.205000000000002 0.2925000000000005,5.205000000000002 0.2925000000000005,5.405000000000002" data-type="line" data-label="" points="478.6789960369881,126.30559225011007 478.6789960369881,136.16908850726549 432.8137384412153,136.16908850726549 432.8137384412153,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-3.7550000000000003,3.7683333333333353 -3.7550000000000003,3.9683333333333355 -4.6850000000000005,3.9683333333333355 -4.6850000000000005,3.7683333333333353" data-type="line" data-label="" points="233.2012329370322,207.0218699544987 233.2012329370322,197.15837369734325 187.3359753412594,197.15837369734325 187.3359753412594,207.0218699544987" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="2.152500000000001,5.405000000000002 2.152500000000001,5.205000000000002 1.2225000000000006,5.205000000000002 1.2225000000000006,5.405000000000002" data-type="line" data-label="" points="524.5442536327608,126.30559225011007 524.5442536327608,136.16908850726549 478.6789960369881,136.16908850726549 478.6789960369881,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-6.415,3.7683333333333353 -6.415,3.9683333333333355 -4.6850000000000005,3.9683333333333355 -4.6850000000000005,3.7683333333333353" data-type="line" data-label="" points="102.01673271686491,207.0218699544987 102.01673271686491,197.15837369734325 187.3359753412594,197.15837369734325 187.3359753412594,207.0218699544987" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-3.7550000000000003,2.668333333333335 -3.7550000000000003,2.4683333333333346 -4.6850000000000005,2.4683333333333346 -4.6850000000000005,2.668333333333335" data-type="line" data-label="" points="233.2012329370322,261.2710993688536 233.2012329370322,271.13459562600906 187.3359753412594,271.13459562600906 187.3359753412594,261.2710993688536" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.1099999999999999,2.600000000000002 -1.3099999999999998,2.600000000000002 -1.3099999999999998,2.8000000000000016 -1.1099999999999999,2.8000000000000016" data-type="line" data-label="" points="363.6459709379128,264.64112725671504 353.7824746807574,264.64112725671504 353.7824746807574,254.77763099955962 363.6459709379128,254.77763099955962" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-6.415,2.6683333333333357 -6.415,2.4683333333333346 -4.6850000000000005,2.4683333333333346 -4.6850000000000005,2.668333333333335" data-type="line" data-label="" points="102.01673271686491,261.2710993688536 102.01673271686491,271.13459562600906 187.3359753412594,271.13459562600906 187.3359753412594,261.2710993688536" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.025,2.000000000000001 -2.025,2.200000000000001 -1.3099999999999998,2.200000000000001 -1.3099999999999998,2.0000000000000018 -1.1099999999999999,2.0000000000000018" data-type="line" data-label="" points="318.5204755614267,294.2316160281814 318.5204755614267,284.36811977102593 353.7824746807574,284.36811977102593 353.7824746807574,294.23161602818135 363.6459709379128,294.23161602818135" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.1099999999999999,1.2000000000000015 -1.3099999999999998,1.2000000000000015 -1.3099999999999998,1.0000000000000013 -1.1099999999999999,1.0000000000000013" data-type="line" data-label="" points="363.6459709379128,333.6856010568031 353.7824746807574,333.6856010568031 353.7824746807574,343.54909731395855 363.6459709379128,343.54909731395855" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.025,-1.6000000000000003 -2.025,-1.4000000000000004 -1.3099999999999998,-1.4000000000000004 -1.3099999999999998,-1.6000000000000008 -1.1099999999999997,-1.6000000000000008" data-type="line" data-label="" points="318.5204755614267,471.7745486569793 318.5204755614267,461.9110523998238 353.7824746807574,461.9110523998238 353.7824746807574,471.7745486569793 363.6459709379128,471.7745486569793" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.5675,6.505000000000002 -1.5675,6.705000000000002 -0.6375000000000002,6.705000000000002 -0.6375000000000002,6.505000000000002" data-type="line" data-label="" points="341.08322324966974,72.05636283575518 341.08322324966974,62.19286657859976 386.94848084544253,62.19286657859976 386.94848084544253,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.6375000000000002,5.405000000000002 -0.6375000000000002,5.205000000000002 -1.5675,5.205000000000002 -1.5675,5.405000000000002" data-type="line" data-label="" points="386.94848084544253,126.30559225011007 386.94848084544253,136.16908850726549 341.08322324966974,136.16908850726549 341.08322324966974,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.1099999999999999,0.8000000000000012 -1.3099999999999998,0.8000000000000012 -1.3099999999999998,0.600000000000001 -1.1099999999999999,0.600000000000001" data-type="line" data-label="" points="363.6459709379128,353.412593571114 353.7824746807574,353.412593571114 353.7824746807574,363.2760898282694 363.6459709379128,363.2760898282694" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.4975,5.405000000000002 -2.4975,5.205000000000002 -1.5674999999999994,5.205000000000002 -1.5674999999999994,5.405000000000002" data-type="line" data-label="" points="295.21796565389695,126.30559225011007 295.21796565389695,136.16908850726549 341.0832232496698,136.16908850726549 341.0832232496698,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="0.29250000000000037,6.505000000000002 0.29250000000000037,6.705000000000002 1.222500000000001,6.705000000000002 1.222500000000001,6.505000000000002" data-type="line" data-label="" points="432.8137384412153,72.05636283575518 432.8137384412153,62.19286657859976 478.6789960369881,62.19286657859976 478.6789960369881,72.05636283575518" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="0.29250000000000076,5.405000000000002 0.29250000000000076,5.205000000000002 -0.6374999999999998,5.205000000000002 -0.6374999999999998,5.405000000000002" data-type="line" data-label="" points="432.8137384412153,126.30559225011007 432.8137384412153,136.16908850726549 386.94848084544253,136.16908850726549 386.94848084544253,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.1099999999999999,0.4000000000000008 -1.3099999999999998,0.4000000000000008 -1.3099999999999998,0.20000000000000062 -1.1099999999999999,0.20000000000000062" data-type="line" data-label="" points="363.6459709379128,373.13958608542487 353.7824746807574,373.13958608542487 353.7824746807574,383.0030823425803 363.6459709379128,383.0030823425803" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.222500000000001,5.405000000000002 1.222500000000001,5.205000000000002 0.2925000000000005,5.205000000000002 0.2925000000000005,5.405000000000002" data-type="line" data-label="" points="478.6789960369881,126.30559225011007 478.6789960369881,136.16908850726549 432.8137384412153,136.16908850726549 432.8137384412153,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.1099999999999999,2.8000000000000016 -1.3099999999999998,2.8000000000000016 -1.3099999999999998,2.600000000000002 -1.1099999999999999,2.600000000000002" data-type="line" data-label="" points="363.6459709379128,254.77763099955962 353.7824746807574,254.77763099955962 353.7824746807574,264.64112725671504 363.6459709379128,264.64112725671504" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.152500000000001,5.405000000000002 2.152500000000001,5.205000000000002 1.2225000000000006,5.205000000000002 1.2225000000000006,5.405000000000002" data-type="line" data-label="" points="524.5442536327608,126.30559225011007 524.5442536327608,136.16908850726549 478.6789960369881,136.16908850726549 478.6789960369881,126.30559225011007" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-4.6850000000000005,3.7683333333333353 -4.6850000000000005,3.9683333333333355 -3.7550000000000003,3.9683333333333355 -3.7550000000000003,3.7683333333333353" data-type="line" data-label="" points="187.3359753412594,207.0218699544987 187.3359753412594,197.15837369734325 233.2012329370322,197.15837369734325 233.2012329370322,207.0218699544987" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-3.7550000000000003,2.668333333333335 -3.7550000000000003,2.4683333333333346 -4.6850000000000005,2.4683333333333346 -4.6850000000000005,2.668333333333335" data-type="line" data-label="" points="233.2012329370322,261.2710993688536 233.2012329370322,271.13459562600906 187.3359753412594,271.13459562600906 187.3359753412594,261.2710993688536" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.025,0.9000000000000021 -2.025,0.7000000000000011 -2.49,0.7000000000000011 -2.49,-2.9000000000000004 -2.025,-2.9000000000000004 -2.025,-2.7" data-type="line" data-label="" points="318.5204755614267,348.4808454425362 318.5204755614267,358.3443416996917 295.5878467635403,358.3443416996917 295.5878467635403,535.8872743284896 318.5204755614267,535.8872743284896 318.5204755614267,526.0237780713342" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-6.415,2.6683333333333357 -6.415,2.4683333333333346 -4.6850000000000005,2.4683333333333346 -4.6850000000000005,2.668333333333335" data-type="line" data-label="" points="102.01673271686491,261.2710993688536 102.01673271686491,271.13459562600906 187.3359753412594,271.13459562600906 187.3359753412594,261.2710993688536" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.3099999999999998,0.7000000000000011 -1.4109999999999998,0.7000000000000011 -1.4109999999999998,0.7010000000000011" data-type="line" data-label="" points="353.7824746807574,358.3443416996917 348.8014090708939,358.3443416996917 348.8014090708939,358.2950242184059" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.025,0.9000000000000021 -2.025,0.7000000000000011 -2.49,0.7000000000000011 -2.49,-2.9000000000000004 -2.025,-2.9000000000000004 -2.025,-2.7" data-type="line" data-label="" points="318.5204755614267,348.4808454425362 318.5204755614267,358.3443416996917 295.5878467635403,358.3443416996917 295.5878467635403,535.8872743284896 318.5204755614267,535.8872743284896 318.5204755614267,526.0237780713342" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.3099999999999998,0.4000000000000008 -1.511,0.4000000000000008 -1.511,1.151000000000001" data-type="line" data-label="" points="353.7824746807574,373.13958608542487 343.86966094231616,373.13958608542487 343.86966094231616,336.1021576398062" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <rect data-type="rect" data-label="schematic_component_0" data-x="0.79" data-y="0" x="363.6459709379128" y="185.73315719947155" width="187.40642888595323" height="414.2668428005285" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
@@ -888,7 +900,32 @@ available orientations: y+" data-x="-1.3099999999999998" data-y="1.4250000000000
   <g>
     <rect data-type="rect" data-label="netId: V3_3
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="0.29250000000000076" data-y="6.9300000000000015" x="427.8819903126376" y="40.00000000000006" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+available orientations: y+" data-x="-1.5675" data-y="6.9300000000000015" x="336.15147512109206" y="40.00000000000006" width="9.863496257155418" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="-1.4109999999999998" data-y="0.926000000000001" x="343.86966094231616" y="336.1021576398062" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="-2.4975" data-y="6.731000000000002" x="290.2862175253193" y="49.81417877586972" width="9.863496257155418" height="22.19286657859965" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="0.29250000000000037" data-y="6.9300000000000015" x="427.8819903126376" y="40.00000000000006" width="9.863496257155418" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="-1.511" data-y="1.376000000000001" x="338.9379128137384" y="313.90929106120643" width="9.863496257155475" height="22.192866578599762" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="2.1525000000000007" data-y="6.731000000000002" x="519.6125055041831" y="49.81417877586972" width="9.863496257155475" height="22.19286657859965" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V1_1
@@ -898,7 +935,12 @@ available orientations: y+" data-x="-1.3099999999999998" data-y="3.0250000000000
   <g>
     <rect data-type="rect" data-label="netId: V1_1
 globalConnNetId: connectivity_net6
-available orientations: y+" data-x="-3.7550000000000003" data-y="4.193333333333335" x="228.26948480845445" y="174.96550711874357" width="9.863496257155447" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+available orientations: y+" data-x="-4.6850000000000005" data-y="4.193333333333335" x="182.4042272126817" y="174.96550711874357" width="9.863496257155418" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V1_1
+globalConnNetId: connectivity_net6
+available orientations: y+" data-x="-6.415" data-y="3.9943333333333353" x="97.08498458828723" y="184.7796858946132" width="9.863496257155418" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: capacitor.C11 &gt; port.pin1 to U3.ADC_AVDD
diff --git a/tests/examples/__snapshots__/example18.snap.svg b/tests/examples/__snapshots__/example18.snap.svg
index 8c7f05fc..00bcc3b0 100644
--- a/tests/examples/__snapshots__/example18.snap.svg
+++ b/tests/examples/__snapshots__/example18.snap.svg
@@ -2,193 +2,199 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="U3.8
-x-" data-x="-1.4" data-y="0.42500000000000004" cx="211.29957848579102" cy="266.28437168733643" r="3" fill="hsl(88, 100%, 50%, 0.8)" />
+x-" data-x="-1.4" data-y="0.42500000000000004" cx="207.72778152529193" cy="255.3187797395407" r="3" fill="hsl(88, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.4
-x-" data-x="-1.4" data-y="-0.42500000000000004" cx="211.29957848579102" cy="342.38151179694313" r="3" fill="hsl(84, 100%, 50%, 0.8)" />
+x-" data-x="-1.4" data-y="-0.42500000000000004" cx="207.72778152529193" cy="333.9164026436013" r="3" fill="hsl(84, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.1
-x+" data-x="1.4" data-y="0.5" cx="461.9725106115543" cy="259.56991814825346" r="3" fill="hsl(81, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="0.5" cx="466.63759815043284" cy="248.383695365653" r="3" fill="hsl(81, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.6
-x+" data-x="1.4" data-y="0.30000000000000004" cx="461.9725106115543" cy="277.47512758580797" r="3" fill="hsl(86, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="0.30000000000000004" cx="466.63759815043284" cy="266.8772536960202" r="3" fill="hsl(86, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.5
-x+" data-x="1.4" data-y="0.10000000000000009" cx="461.9725106115543" cy="295.38033702336253" r="3" fill="hsl(85, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="0.10000000000000009" cx="466.63759815043284" cy="285.3708120263874" r="3" fill="hsl(85, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.2
-x+" data-x="1.4" data-y="-0.09999999999999998" cx="461.9725106115543" cy="313.28554646091703" r="3" fill="hsl(82, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="-0.09999999999999998" cx="466.63759815043284" cy="303.86437035675465" r="3" fill="hsl(82, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.3
-x+" data-x="1.4" data-y="-0.3" cx="461.9725106115543" cy="331.1907558984716" r="3" fill="hsl(83, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="-0.3" cx="466.63759815043284" cy="322.35792868712184" r="3" fill="hsl(83, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U3.7
-x+" data-x="1.4" data-y="-0.5" cx="461.9725106115543" cy="349.0959653360261" r="3" fill="hsl(87, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="-0.5" cx="466.63759815043284" cy="340.85148701748903" r="3" fill="hsl(87, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C20.1
-y+" data-x="-2.3148566499999994" data-y="0.5512093000000002" cx="129.39607886784347" cy="254.98535194000064" r="3" fill="hsl(140, 100%, 50%, 0.8)" />
+y+" data-x="-2.3148566499999994" data-y="0.5512093000000002" cx="123.13300742179533" cy="243.64848448261662" r="3" fill="hsl(140, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C20.2
-y-" data-x="-2.31430995" data-y="-0.5512093000000002" cx="129.44502275784095" cy="353.6805315442789" r="3" fill="hsl(141, 100%, 50%, 0.8)" />
+y-" data-x="-2.31430995" data-y="-0.5512093000000002" cx="123.18355956349131" cy="345.58669790052545" r="3" fill="hsl(141, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R11.1
-y+" data-x="1.7580660749999977" data-y="2.3025814000000002" cx="494.0287509383446" cy="98.19193067205222" r="3" fill="hsl(125, 100%, 50%, 0.8)" />
+y+" data-x="1.7580660749999977" data-y="2.3025814000000002" cx="499.74717737112326" cy="81.7029740349781" r="3" fill="hsl(125, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R11.2
-y-" data-x="1.757519574999999" data-y="1.2" cx="493.97982495355666" cy="196.90168511681264" r="3" fill="hsl(126, 100%, 50%, 0.8)" />
+y-" data-x="1.757519574999999" data-y="1.2" cx="499.69664372298564" cy="183.6562412093678" r="3" fill="hsl(126, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R12.1
-y-" data-x="-1.7580660749999977" data-y="-3.3025814000000002" cx="179.24333815900067" cy="600" r="3" fill="hsl(6, 100%, 50%, 0.8)" />
+y-" data-x="-1.7580660749999977" data-y="-3.3025814000000002" cx="174.61820230460145" cy="600" r="3" fill="hsl(6, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R12.2
-y+" data-x="-1.757519574999999" data-y="-2.2" cx="179.29226414378866" cy="501.29024555523955" r="3" fill="hsl(7, 100%, 50%, 0.8)" />
+y+" data-x="-1.757519574999999" data-y="-2.2" cx="174.66873595273907" cy="498.0467328256103" r="3" fill="hsl(7, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R13.1
-y-" data-x="1.7580660749999977" data-y="-3.3025814000000002" cx="494.0287509383446" cy="600" r="3" fill="hsl(247, 100%, 50%, 0.8)" />
+y-" data-x="1.7580660749999977" data-y="-3.3025814000000002" cx="499.74717737112326" cy="600" r="3" fill="hsl(247, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R13.2
-y+" data-x="1.757519574999999" data-y="-2.2" cx="493.97982495355666" cy="501.29024555523955" r="3" fill="hsl(248, 100%, 50%, 0.8)" />
+y+" data-x="1.757519574999999" data-y="-2.2" cx="499.69664372298564" cy="498.0467328256103" r="3" fill="hsl(248, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.8574283249999997" data-y="0.7512093000000004" cx="170.34782867681724" cy="237.0801425024461" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-2.3148566499999994" data-y="0.7512093000000004" cx="123.13300742179533" cy="225.1549261522494" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.5790330374999988" data-y="2.5025814000000004" cx="478.0006307749495" cy="80.28672123449769" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="1.5999999999999999" data-y="-0.3" cx="485.1311564808" cy="322.35792868712184" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-2.31430995" data-y="-0.7512093000000004" cx="129.44502275784095" cy="371.58574098183345" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="1.7580660749999977" data-y="2.3025814000000002" cx="499.74717737112326" cy="81.7029740349781" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.757519574999999" data-y="0.85" cx="493.97982495355666" cy="228.23580163253305" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y-" data-x="-2.31430995" data-y="-0.7512093000000004" cx="123.18355956349131" cy="364.08025623089264" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.757519574999999" data-y="-2" cx="493.97982495355666" cy="483.385036117685" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x+" data-x="1.757519574999999" data-y="0.85" cx="499.69664372298564" cy="216.0199682875104" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="-2.3148566499999994,0.5512093000000002 -1.4,0.42500000000000004" data-type="line" data-label="" points="129.39607886784347,254.98535194000064 211.29957848579102,266.28437168733643" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
+    <circle data-type="point" data-label="anchorPoint
+orientation: x+" data-x="1.757519574999999" data-y="-2" cx="499.69664372298564" cy="479.55317449524307" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <polyline data-points="-2.3148566499999994,0.5512093000000002 -1.4,0.42500000000000004" data-type="line" data-label="" points="123.13300742179533,243.64848448261662 207.72778152529193,255.3187797395407" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.31430995,-0.5512093000000002 -1.4,-0.42500000000000004" data-type="line" data-label="" points="129.44502275784095,353.6805315442789 211.29957848579102,342.38151179694313" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="-2.31430995,-0.5512093000000002 -1.4,-0.42500000000000004" data-type="line" data-label="" points="123.18355956349131,345.58669790052545 207.72778152529193,333.9164026436013" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.757519574999999,1.2 1.4,0.5" data-type="line" data-label="" points="493.97982495355666,196.90168511681264 461.9725106115543,259.56991814825346" fill="none" stroke="hsl(144, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="1.757519574999999,1.2 1.4,0.5" data-type="line" data-label="" points="499.69664372298564,183.6562412093678 466.63759815043284,248.383695365653" fill="none" stroke="hsl(144, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.757519574999999,-2.2 -1.757519574999999,-2.2" data-type="line" data-label="" points="493.97982495355666,501.29024555523955 179.29226414378866,501.29024555523955" fill="none" stroke="hsl(144, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="1.757519574999999,-2.2 -1.757519574999999,-2.2" data-type="line" data-label="" points="499.69664372298564,498.0467328256103 174.66873595273907,498.0467328256103" fill="none" stroke="hsl(144, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 1.4,-0.3" data-type="line" data-label="" points="211.29957848579102,266.28437168733643 461.9725106115543,331.1907558984716" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.42500000000000004 1.4,-0.3" data-type="line" data-label="" points="207.72778152529193,255.3187797395407 466.63759815043284,322.35792868712184" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 1.4,-0.5" data-type="line" data-label="" points="211.29957848579102,266.28437168733643 461.9725106115543,349.0959653360261" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.42500000000000004 1.4,-0.5" data-type="line" data-label="" points="207.72778152529193,255.3187797395407 466.63759815043284,340.85148701748903" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="211.29957848579102,266.28437168733643 129.39607886784347,254.98535194000064" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.42500000000000004 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="207.72778152529193,255.3187797395407 123.13300742179533,243.64848448261662" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="211.29957848579102,266.28437168733643 494.0287509383446,98.19193067205222" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.42500000000000004 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="207.72778152529193,255.3187797395407 499.74717737112326,81.7029740349781" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.3 1.4,-0.5" data-type="line" data-label="" points="461.9725106115543,331.1907558984716 461.9725106115543,349.0959653360261" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.3 1.4,-0.5" data-type="line" data-label="" points="466.63759815043284,322.35792868712184 466.63759815043284,340.85148701748903" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.3 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="461.9725106115543,331.1907558984716 129.39607886784347,254.98535194000064" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.3 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="466.63759815043284,322.35792868712184 123.13300742179533,243.64848448261662" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.3 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="461.9725106115543,331.1907558984716 494.0287509383446,98.19193067205222" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.3 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="466.63759815043284,322.35792868712184 499.74717737112326,81.7029740349781" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.5 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="461.9725106115543,349.0959653360261 129.39607886784347,254.98535194000064" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.5 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="466.63759815043284,340.85148701748903 123.13300742179533,243.64848448261662" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.5 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="461.9725106115543,349.0959653360261 494.0287509383446,98.19193067205222" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.5 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="466.63759815043284,340.85148701748903 499.74717737112326,81.7029740349781" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-2.3148566499999994,0.5512093000000002 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="129.39607886784347,254.98535194000064 494.0287509383446,98.19193067205222" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-2.3148566499999994,0.5512093000000002 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="123.13300742179533,243.64848448261662 499.74717737112326,81.7029740349781" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.42500000000000004 -2.31430995,-0.5512093000000002" data-type="line" data-label="" points="211.29957848579102,342.38151179694313 129.44502275784095,353.6805315442789" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,-0.42500000000000004 -2.31430995,-0.5512093000000002" data-type="line" data-label="" points="207.72778152529193,333.9164026436013 123.18355956349131,345.58669790052545" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,0.5 1.757519574999999,1.2" data-type="line" data-label="" points="461.9725106115543,259.56991814825346 493.97982495355666,196.90168511681264" fill="none" stroke="hsl(304, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,0.5 1.757519574999999,1.2" data-type="line" data-label="" points="466.63759815043284,248.383695365653 499.69664372298564,183.6562412093678" fill="none" stroke="hsl(304, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.42500000000000004 -1.8574283249999997,0.42500000000000004 -1.8574283249999997,0.7512093000000004 -2.3148566499999994,0.7512093000000004 -2.3148566499999994,0.5512093000000002" data-type="line" data-label="" points="211.29957848579102,266.28437168733643 170.34782867681724,266.28437168733643 170.34782867681724,237.0801425024461 129.39607886784347,237.0801425024461 129.39607886784347,254.98535194000064" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.3148566499999994,0.5512093000000002 -2.3148566499999994,0.7512093000000004 -1.8574283249999997,0.7512093000000004 -1.8574283249999997,0.42500000000000004 -1.4,0.42500000000000004" data-type="line" data-label="" points="123.13300742179533,243.64848448261662 123.13300742179533,225.1549261522494 165.43039447354363,225.1549261522494 165.43039447354363,255.3187797395407 207.72778152529193,255.3187797395407" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.3 1.5790330374999988,-0.3 1.5790330374999988,2.5025814000000004 1.7580660749999977,2.5025814000000004 1.7580660749999977,2.3025814000000002" data-type="line" data-label="" points="461.9725106115543,331.1907558984716 478.0006307749495,331.1907558984716 478.0006307749495,80.28672123449769 494.0287509383446,80.28672123449769 494.0287509383446,98.19193067205222" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.31430995,-0.5512093000000002 -2.31430995,-0.7512093000000004 -1.857154975,-0.7512093000000004 -1.857154975,-0.42500000000000004 -1.4,-0.42500000000000004" data-type="line" data-label="" points="123.18355956349131,345.58669790052545 123.18355956349131,364.08025623089264 165.45567054439164,364.08025623089264 165.45567054439164,333.9164026436013 207.72778152529193,333.9164026436013" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.5 1.5999999999999999,-0.5 1.5999999999999999,-0.3 1.4,-0.3" data-type="line" data-label="" points="461.9725106115543,349.0959653360261 479.8777200491088,349.0959653360261 479.8777200491088,331.1907558984716 461.9725106115543,331.1907558984716" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.757519574999999,1.2 1.757519574999999,0.5 1.4,0.5" data-type="line" data-label="" points="499.69664372298564,183.6562412093678 499.69664372298564,248.383695365653 466.63759815043284,248.383695365653" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.31430995,-0.5512093000000002 -2.31430995,-0.7512093000000004 -1.857154975,-0.7512093000000004 -1.857154975,-0.42500000000000004 -1.4,-0.42500000000000004" data-type="line" data-label="" points="129.44502275784095,353.6805315442789 129.44502275784095,371.58574098183345 170.37230062181598,371.58574098183345 170.37230062181598,342.38151179694313 211.29957848579102,342.38151179694313" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.757519574999999,-2.2 1.757519574999999,-2 -1.757519574999999,-2 -1.757519574999999,-2.2" data-type="line" data-label="" points="499.69664372298564,498.0467328256103 499.69664372298564,479.55317449524307 174.66873595273907,479.55317449524307 174.66873595273907,498.0467328256103" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.757519574999999,1.2 1.757519574999999,0.5 1.4,0.5" data-type="line" data-label="" points="493.97982495355666,196.90168511681264 493.97982495355666,259.56991814825346 461.9725106115543,259.56991814825346" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.4,-0.3 1.5999999999999999,-0.3 1.5999999999999999,-0.5 1.4,-0.5" data-type="line" data-label="" points="466.63759815043284,322.35792868712184 485.1311564808,322.35792868712184 485.1311564808,340.85148701748903 466.63759815043284,340.85148701748903" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.757519574999999,-2.2 1.757519574999999,-2 -1.757519574999999,-2 -1.757519574999999,-2.2" data-type="line" data-label="" points="493.97982495355666,501.29024555523955 493.97982495355666,483.385036117685 179.29226414378866,483.385036117685 179.29226414378866,501.29024555523955" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="207.72778152529193" y="229.89013703528582" width="258.90981662514093" height="129.4549083125704" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="211.29957848579102" y="241.66470871069896" width="250.67293212576328" height="125.33646606288164" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="-2.3145833" data-y="0" x="98.6928500336881" y="243.64848448261662" width="48.930866917910436" height="101.93821341790883" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="-2.3145833" data-y="0" x="105.73345381194562" y="254.98535194000064" width="47.37419400179317" height="98.69517960427825" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
+    <rect data-type="rect" data-label="schematic_component_2" data-x="1.7577928249999983" data-y="1.7512907000000002" x="485.1311564808" y="81.7029740349781" width="29.181508132508952" height="101.95326717438971" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_2" data-x="1.7577928249999983" data-y="1.7512907000000002" x="479.87772004910886" y="98.19193067205222" width="28.25313579368361" height="98.70975444476042" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
+    <rect data-type="rect" data-label="schematic_component_3" data-x="-1.7577928249999983" data-y="-2.7512907" x="160.0527150624158" y="498.0467328256103" width="29.181508132508924" height="101.95326717438968" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_3" data-x="-1.7577928249999983" data-y="-2.7512907" x="165.14123325455287" y="501.29024555523955" width="28.253135793683583" height="98.70975444476045" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
+    <rect data-type="rect" data-label="schematic_component_4" data-x="1.7577928249999983" data-y="-2.7512907" x="485.1311564808" y="498.0467328256103" width="29.181508132508952" height="101.95326717438968" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_4" data-x="1.7577928249999983" data-y="-2.7512907" x="479.87772004910886" y="501.29024555523955" width="28.25313579368361" height="98.70975444476045" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0
+available orientations: y+" data-x="-2.3148566499999994" data-y="0.9762093000000004" x="113.8862282566117" y="183.5444199089232" width="18.49355833036722" height="41.6105062433262" fill="#ef444466" stroke="#ef4444" stroke-width="0.010814576428571431" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V3_3
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="-1.8574283249999997" data-y="0.9762093000000004" x="161.39522395803996" y="196.79342126794842" width="17.905209437554532" height="40.28672123449769" fill="#ef444466" stroke="#ef4444" stroke-width="0.011169933571428573" />
+available orientations: y+" data-x="1.5999999999999999" data-y="-0.07499999999999998" x="475.88437731561635" y="280.74742244379564" width="18.49355833036725" height="41.6105062433262" fill="#ef444466" stroke="#ef4444" stroke-width="0.010814576428571431" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V3_3
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="1.5790330374999988" data-y="2.7275814000000005" x="469.0480260561722" y="40" width="17.90520943755456" height="40.28672123449769" fill="#ef444466" stroke="#ef4444" stroke-width="0.011169933571428573" />
+available orientations: y+" data-x="1.7580660749999977" data-y="2.5285814" x="490.50039820593963" y="40.00000000000006" width="18.49355833036725" height="41.61050624332623" fill="#ef444466" stroke="#ef4444" stroke-width="0.010814576428571431" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
 globalConnNetId: connectivity_net1
-available orientations: y-" data-x="-2.31430995" data-y="-0.9762093000000004" x="120.4924180390637" y="371.58574098183345" width="17.905209437554532" height="40.28672123449769" fill="#00000066" stroke="#000000" stroke-width="0.011169933571428573" />
+available orientations: y-" data-x="-2.31430995" data-y="-0.9762093000000004" x="113.93678039830769" y="364.08025623089264" width="18.49355833036722" height="41.6105062433262" fill="#00000066" stroke="#000000" stroke-width="0.010814576428571431" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: FLASH_N_CS
 globalConnNetId: connectivity_net2
-available orientations: any" data-x="1.982519574999999" data-y="0.85" x="493.97982495355666" y="219.2831969137558" width="40.28672123449769" height="17.905209437554532" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011169933571428573" />
+available orientations: any" data-x="1.982519574999999" data-y="0.85" x="499.69664372298564" y="206.7731891223268" width="41.61050624332631" height="18.493558330367193" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: resistor.R11 &gt; port.pin1 to resistor.R12 &gt; port.pin1
 globalConnNetId: connectivity_net3
-available orientations: any" data-x="1.982519574999999" data-y="-2" x="493.97982495355666" y="474.43243139890774" width="40.28672123449769" height="17.90520943755456" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011169933571428573" />
+available orientations: any" data-x="1.982519574999999" data-y="-2" x="499.69664372298564" y="470.30639533005944" width="41.61050624332631" height="18.49355833036725" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010814576428571431" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -218,12 +224,12 @@ available orientations: any" data-x="1.982519574999999" data-y="-2" x="493.97982
 
       // Calculate real coordinates using inverse transformation
       const matrix = {
-        "a": 89.52604718777262,
+        "a": 92.46779165183602,
         "c": 0,
-        "e": 336.63604454867266,
+        "e": 337.18268983786237,
         "b": 0,
-        "d": -89.52604718777262,
-        "f": 304.3329417421398
+        "d": -92.46779165183602,
+        "f": 294.617591191571
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute:
diff --git a/tests/examples/__snapshots__/example21.snap.svg b/tests/examples/__snapshots__/example21.snap.svg
index 85810dff..08266c38 100644
--- a/tests/examples/__snapshots__/example21.snap.svg
+++ b/tests/examples/__snapshots__/example21.snap.svg
@@ -2,242 +2,239 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="CORNERS.1
-x-" data-x="-1.4" data-y="-0.6" cx="65.61715719826601" cy="313.6436230892083" r="3" fill="hsl(65, 100%, 50%, 0.8)" />
+x-" data-x="-1.4" data-y="-0.6" cx="59.38834391229081" cy="316.7686093479515" r="3" fill="hsl(65, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="CORNERS.2
-x-" data-x="-1.4" data-y="0.6" cx="65.61715719826601" cy="236.98380104950945" r="3" fill="hsl(66, 100%, 50%, 0.8)" />
+x-" data-x="-1.4" data-y="0.6" cx="59.38834391229081" cy="239.2152336987882" r="3" fill="hsl(66, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="CORNERS.3
-x+" data-x="1.4" data-y="0.6" cx="244.49007529089664" cy="236.98380104950945" r="3" fill="hsl(67, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="0.6" cx="240.34622042700522" cy="239.2152336987882" r="3" fill="hsl(67, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="CORNERS.4
-x+" data-x="1.4" data-y="-0.6" cx="244.49007529089664" cy="313.6436230892083" r="3" fill="hsl(68, 100%, 50%, 0.8)" />
+x+" data-x="1.4" data-y="-0.6" cx="240.34622042700522" cy="316.7686093479515" r="3" fill="hsl(68, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U100.1
-x-" data-x="3.785" data-y="-0.29999999999999993" cx="396.8514715947981" cy="294.4786675792836" r="3" fill="hsl(175, 100%, 50%, 0.8)" />
+x-" data-x="3.785" data-y="-0.29999999999999993" cx="394.4835545297173" cy="297.3802654356607" r="3" fill="hsl(175, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U100.2
-y-" data-x="4.785" data-y="-1.2999999999999998" cx="460.73465662788044" cy="358.36185261236596" r="3" fill="hsl(176, 100%, 50%, 0.8)" />
+y-" data-x="4.785" data-y="-1.2999999999999998" cx="459.11136757068675" cy="362.0080784766301" r="3" fill="hsl(176, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U100.3
-x-" data-x="3.785" data-y="-0.4999999999999999" cx="396.8514715947981" cy="307.25530458590003" r="3" fill="hsl(177, 100%, 50%, 0.8)" />
+x-" data-x="3.785" data-y="-0.4999999999999999" cx="394.4835545297173" cy="310.30582804385455" r="3" fill="hsl(177, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U100.5
-x+" data-x="5.785" data-y="-0.3999999999999999" cx="524.6178416609628" cy="300.86698608259184" r="3" fill="hsl(179, 100%, 50%, 0.8)" />
+x+" data-x="5.785" data-y="-0.3999999999999999" cx="523.7391806116561" cy="303.8430467397576" r="3" fill="hsl(179, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C101.1
-y+" data-x="6.7" data-y="-0.39999999999999925" cx="583.0709559662332" cy="300.8669860825918" r="3" fill="hsl(218, 100%, 50%, 0.8)" />
+y+" data-x="6.7" data-y="-0.39999999999999925" cx="582.8736295441432" cy="303.8430467397576" r="3" fill="hsl(218, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C101.2
-y-" data-x="6.7" data-y="-1.4999999999999993" cx="583.0709559662332" cy="371.13848961898236" r="3" fill="hsl(219, 100%, 50%, 0.8)" />
+y-" data-x="6.7" data-y="-1.4999999999999993" cx="582.8736295441432" cy="374.93364108482393" r="3" fill="hsl(219, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C100.1
-y+" data-x="2.8699999999999997" data-y="-1.2" cx="338.39835728952767" cy="351.9735341090577" r="3" fill="hsl(337, 100%, 50%, 0.8)" />
+y+" data-x="2.8699999999999997" data-y="-1.2" cx="335.3491055972303" cy="355.5452971725332" r="3" fill="hsl(337, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C100.2
-y-" data-x="2.8699999999999997" data-y="-2.3" cx="338.39835728952767" cy="422.2450376454483" r="3" fill="hsl(338, 100%, 50%, 0.8)" />
+y-" data-x="2.8699999999999997" data-y="-2.3" cx="335.3491055972303" cy="426.63589151759953" r="3" fill="hsl(338, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R100.1
-y+" data-x="2.9752723250000006" data-y="0.6000000000000003" cx="345.1234887063655" cy="236.98380104950942" r="3" fill="hsl(82, 100%, 50%, 0.8)" />
+y+" data-x="2.9752723250000006" data-y="0.6000000000000003" cx="342.1526257357185" cy="239.21523369878818" r="3" fill="hsl(82, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R100.2
-y-" data-x="2.9752723250000006" data-y="-0.4999999999999998" cx="345.1234887063655" cy="307.25530458590003" r="3" fill="hsl(83, 100%, 50%, 0.8)" />
+y-" data-x="2.9752723250000006" data-y="-0.4999999999999998" cx="342.1526257357185" cy="310.30582804385455" r="3" fill="hsl(83, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-1.551" data-y="-0.651" cx="55.97079625827058" cy="316.9016655258955" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y-" data-x="-1.5999999999999999" data-y="-1.2" cx="46.462781304096936" cy="355.5452971725332" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="1.551" data-y="-0.651" cx="254.13643623089206" cy="316.9016655258955" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y-" data-x="2.8699999999999997" data-y="-2.5" cx="335.3491055972303" cy="439.56145412579343" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="2.8699999999999997" data-y="-2.5" cx="338.39835728952767" cy="435.0216746520648" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="2.8699999999999997" data-y="-1.2" cx="335.3491055972303" cy="355.5452971725332" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.6004999999999998" data-y="0.6" cx="52.808578599133014" cy="236.98380104950945" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="3.6340000000000003" data-y="-0.24899999999999994" cx="384.7247547605309" cy="294.08424697057126" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="2.9752723250000006" data-y="0.8000000000000005" cx="345.1234887063655" cy="224.20716404289294" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-1.5999999999999999" data-y="1.2" cx="46.462781304096936" cy="200.43854587420654" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="6.2425" data-y="-0.19999999999999923" cx="553.844398813598" cy="288.09034907597527" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="6.7" data-y="-0.19999999999999923" cx="582.8736295441432" cy="290.9174841315637" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.501" data-y="1.001" cx="250.94227697923793" cy="211.36664385124342" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="1.551" data-y="0.651" cx="250.1050201961916" cy="235.91921523369876" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="2.9752723250000006" data-y="-0.5999999999999999" cx="345.1234887063655" cy="313.6436230892083" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="2.9752723250000006" data-y="-0.5999999999999999" cx="342.1526257357185" cy="316.7686093479515" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="6.7,-0.39999999999999925 5.785,-0.3999999999999999" data-type="line" data-label="" points="583.0709559662332,300.8669860825918 524.6178416609628,300.86698608259184" fill="none" stroke="hsl(176, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="6.7,-0.39999999999999925 5.785,-0.3999999999999999" data-type="line" data-label="" points="582.8736295441432,303.8430467397576 523.7391806116561,303.8430467397576" fill="none" stroke="hsl(176, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.8699999999999997,-1.2 3.785,-0.29999999999999993" data-type="line" data-label="" points="338.39835728952767,351.9735341090577 396.8514715947981,294.4786675792836" fill="none" stroke="hsl(8, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="2.8699999999999997,-1.2 3.785,-0.29999999999999993" data-type="line" data-label="" points="335.3491055972303,355.5452971725332 394.4835545297173,297.3802654356607" fill="none" stroke="hsl(8, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.9752723250000006,-0.4999999999999998 3.785,-0.4999999999999999" data-type="line" data-label="" points="345.1234887063655,307.25530458590003 396.8514715947981,307.25530458590003" fill="none" stroke="hsl(272, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="2.9752723250000006,-0.4999999999999998 3.785,-0.4999999999999999" data-type="line" data-label="" points="342.1526257357185,310.30582804385455 394.4835545297173,310.30582804385455" fill="none" stroke="hsl(272, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.6 1.4,-0.6" data-type="line" data-label="" points="65.61715719826601,313.6436230892083 244.49007529089664,313.6436230892083" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,-0.6 1.4,-0.6" data-type="line" data-label="" points="59.38834391229081,316.7686093479515 240.34622042700522,316.7686093479515" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.6 4.785,-1.2999999999999998" data-type="line" data-label="" points="65.61715719826601,313.6436230892083 460.73465662788044,358.36185261236596" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,-0.6 4.785,-1.2999999999999998" data-type="line" data-label="" points="59.38834391229081,316.7686093479515 459.11136757068675,362.0080784766301" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.6 6.7,-1.4999999999999993" data-type="line" data-label="" points="65.61715719826601,313.6436230892083 583.0709559662332,371.13848961898236" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,-0.6 6.7,-1.4999999999999993" data-type="line" data-label="" points="59.38834391229081,316.7686093479515 582.8736295441432,374.93364108482393" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.6 2.8699999999999997,-2.3" data-type="line" data-label="" points="65.61715719826601,313.6436230892083 338.39835728952767,422.2450376454483" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,-0.6 2.8699999999999997,-2.3" data-type="line" data-label="" points="59.38834391229081,316.7686093479515 335.3491055972303,426.63589151759953" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.6 4.785,-1.2999999999999998" data-type="line" data-label="" points="244.49007529089664,313.6436230892083 460.73465662788044,358.36185261236596" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.6 4.785,-1.2999999999999998" data-type="line" data-label="" points="240.34622042700522,316.7686093479515 459.11136757068675,362.0080784766301" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.6 6.7,-1.4999999999999993" data-type="line" data-label="" points="244.49007529089664,313.6436230892083 583.0709559662332,371.13848961898236" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.6 6.7,-1.4999999999999993" data-type="line" data-label="" points="240.34622042700522,316.7686093479515 582.8736295441432,374.93364108482393" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.6 2.8699999999999997,-2.3" data-type="line" data-label="" points="244.49007529089664,313.6436230892083 338.39835728952767,422.2450376454483" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,-0.6 2.8699999999999997,-2.3" data-type="line" data-label="" points="240.34622042700522,316.7686093479515 335.3491055972303,426.63589151759953" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="4.785,-1.2999999999999998 6.7,-1.4999999999999993" data-type="line" data-label="" points="460.73465662788044,358.36185261236596 583.0709559662332,371.13848961898236" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="4.785,-1.2999999999999998 6.7,-1.4999999999999993" data-type="line" data-label="" points="459.11136757068675,362.0080784766301 582.8736295441432,374.93364108482393" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="4.785,-1.2999999999999998 2.8699999999999997,-2.3" data-type="line" data-label="" points="460.73465662788044,358.36185261236596 338.39835728952767,422.2450376454483" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="4.785,-1.2999999999999998 2.8699999999999997,-2.3" data-type="line" data-label="" points="459.11136757068675,362.0080784766301 335.3491055972303,426.63589151759953" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="6.7,-1.4999999999999993 2.8699999999999997,-2.3" data-type="line" data-label="" points="583.0709559662332,371.13848961898236 338.39835728952767,422.2450376454483" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="6.7,-1.4999999999999993 2.8699999999999997,-2.3" data-type="line" data-label="" points="582.8736295441432,374.93364108482393 335.3491055972303,426.63589151759953" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.6 3.785,-0.29999999999999993" data-type="line" data-label="" points="65.61715719826601,236.98380104950945 396.8514715947981,294.4786675792836" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.6 3.785,-0.29999999999999993" data-type="line" data-label="" points="59.38834391229081,239.2152336987882 394.4835545297173,297.3802654356607" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.6 2.8699999999999997,-1.2" data-type="line" data-label="" points="65.61715719826601,236.98380104950945 338.39835728952767,351.9735341090577" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.6 2.8699999999999997,-1.2" data-type="line" data-label="" points="59.38834391229081,239.2152336987882 335.3491055972303,355.5452971725332" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.6 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="65.61715719826601,236.98380104950945 345.1234887063655,236.98380104950942" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.4,0.6 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="59.38834391229081,239.2152336987882 342.1526257357185,239.21523369878818" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="3.785,-0.29999999999999993 2.8699999999999997,-1.2" data-type="line" data-label="" points="396.8514715947981,294.4786675792836 338.39835728952767,351.9735341090577" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="3.785,-0.29999999999999993 2.8699999999999997,-1.2" data-type="line" data-label="" points="394.4835545297173,297.3802654356607 335.3491055972303,355.5452971725332" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="3.785,-0.29999999999999993 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="396.8514715947981,294.4786675792836 345.1234887063655,236.98380104950942" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="3.785,-0.29999999999999993 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="394.4835545297173,297.3802654356607 342.1526257357185,239.21523369878818" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="2.8699999999999997,-1.2 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="338.39835728952767,351.9735341090577 345.1234887063655,236.98380104950942" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="2.8699999999999997,-1.2 2.9752723250000006,0.6000000000000003" data-type="line" data-label="" points="335.3491055972303,355.5452971725332 342.1526257357185,239.21523369878818" fill="none" stroke="hsl(27, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,0.6 5.785,-0.3999999999999999" data-type="line" data-label="" points="244.49007529089664,236.98380104950945 524.6178416609628,300.86698608259184" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,0.6 5.785,-0.3999999999999999" data-type="line" data-label="" points="240.34622042700522,239.2152336987882 523.7391806116561,303.8430467397576" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4,0.6 6.7,-0.39999999999999925" data-type="line" data-label="" points="244.49007529089664,236.98380104950945 583.0709559662332,300.8669860825918" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="1.4,0.6 6.7,-0.39999999999999925" data-type="line" data-label="" points="240.34622042700522,239.2152336987882 582.8736295441432,303.8430467397576" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="5.785,-0.3999999999999999 6.7,-0.39999999999999925" data-type="line" data-label="" points="524.6178416609628,300.86698608259184 583.0709559662332,300.8669860825918" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="5.785,-0.3999999999999999 6.7,-0.39999999999999925" data-type="line" data-label="" points="523.7391806116561,303.8430467397576 582.8736295441432,303.8430467397576" fill="none" stroke="hsl(64, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="3.785,-0.4999999999999999 2.9752723250000006,-0.4999999999999998" data-type="line" data-label="" points="396.8514715947981,307.25530458590003 345.1234887063655,307.25530458590003" fill="none" stroke="hsl(345, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="3.785,-0.4999999999999999 2.9752723250000006,-0.4999999999999998" data-type="line" data-label="" points="394.4835545297173,310.30582804385455 342.1526257357185,310.30582804385455" fill="none" stroke="hsl(345, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="5.785,-0.3999999999999999 6.2425,-0.3999999999999999 6.2425,-0.19999999999999923 6.7,-0.19999999999999923 6.7,-0.39999999999999925" data-type="line" data-label="" points="524.6178416609628,300.86698608259184 553.844398813598,300.86698608259184 553.844398813598,288.09034907597527 583.0709559662332,288.09034907597527 583.0709559662332,300.8669860825918" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="6.7,-0.39999999999999925 6.7,-0.19999999999999923 6.2425,-0.19999999999999923 6.2425,-0.3999999999999999 5.785,-0.3999999999999999" data-type="line" data-label="" points="582.8736295441432,303.8430467397576 582.8736295441432,290.9174841315637 553.3064050778996,290.9174841315637 553.3064050778996,303.8430467397576 523.7391806116561,303.8430467397576" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.9752723250000006,0.6000000000000003 2.9752723250000006,0.8000000000000005 3.3801361625000004,0.8000000000000005 3.3801361625000004,-0.30000000000000004 3.785,-0.30000000000000004" data-type="line" data-label="" points="345.1234887063655,236.98380104950942 345.1234887063655,224.20716404289294 370.9874801505818,224.20716404289294 370.9874801505818,294.4786675792836 396.8514715947981,294.4786675792836" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="2.9752723250000006,-0.4999999999999998 2.9752723250000006,-0.7 3.585,-0.7 3.585,-0.4999999999999998 3.785,-0.4999999999999998" data-type="line" data-label="" points="342.1526257357185,310.30582804385455 342.1526257357185,323.23139065204845 381.5579919215234,323.23139065204845 381.5579919215234,310.30582804385455 394.4835545297173,310.30582804385455" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.9752723250000006,-0.4999999999999998 2.9752723250000006,-0.7 3.585,-0.7 3.585,-0.4999999999999998 3.785,-0.4999999999999998" data-type="line" data-label="" points="345.1234887063655,307.25530458590003 345.1234887063655,320.03194159251655 384.0748345881816,320.03194159251655 384.0748345881816,307.25530458590003 396.8514715947981,307.25530458590003" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="4.785,-1.2999999999999998 4.785,-1.6999999999999993 6.7,-1.6999999999999993 6.7,-1.4999999999999991" data-type="line" data-label="" points="459.11136757068675,362.0080784766301 459.11136757068675,387.85920369301783 582.8736295441432,387.85920369301783 582.8736295441432,374.93364108482393" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="4.785,-1.2999999999999998 4.785,-1.6999999999999993 6.7,-1.6999999999999993 6.7,-1.4999999999999991" data-type="line" data-label="" points="460.73465662788044,358.36185261236596 460.73465662788044,383.9151266255989 583.0709559662332,383.9151266255989 583.0709559662332,371.13848961898236" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.4,0.6 -1.5999999999999999,0.6 -1.5999999999999999,1.2 2.975272325000001,1.2 2.975272325000001,0.6000000000000003" data-type="line" data-label="" points="59.38834391229081,239.2152336987882 46.462781304096936,239.2152336987882 46.462781304096936,200.43854587420654 342.1526257357185,200.43854587420654 342.1526257357185,239.21523369878818" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.8699999999999997,-2.3 2.8699999999999997,-2.5 6.700000000000001,-2.5 6.700000000000001,-1.4999999999999991" data-type="line" data-label="" points="338.39835728952767,422.2450376454483 338.39835728952767,435.0216746520648 583.0709559662332,435.0216746520648 583.0709559662332,371.13848961898236" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.4,-0.6 -1.5999999999999999,-0.6 -1.5999999999999999,-1.2 1.5999999999999996,-1.2 1.5999999999999996,-0.6 1.3999999999999995,-0.6" data-type="line" data-label="" points="59.38834391229081,316.7686093479515 46.462781304096936,316.7686093479515 46.462781304096936,355.5452971725332 253.27178303519906,355.5452971725332 253.27178303519906,316.7686093479515 240.34622042700516,316.7686093479515" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.4,0.6 -1.8009999999999997,0.6 -1.8009999999999997,-1.1 2.8699999999999997,-1.1 2.8699999999999997,-1.2" data-type="line" data-label="" points="65.61715719826601,236.98380104950945 40,236.98380104950945 40,345.58521560574945 338.39835728952767,345.58521560574945 338.39835728952767,351.9735341090577" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="2.8699999999999997,-2.3 2.8699999999999997,-2.5 6.700000000000001,-2.5 6.700000000000001,-1.4999999999999991" data-type="line" data-label="" points="335.3491055972303,426.63589151759953 335.3491055972303,439.56145412579343 582.8736295441432,439.56145412579343 582.8736295441432,374.93364108482393" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.4,-0.6 -1.551,-0.6 -1.551,-0.651" data-type="line" data-label="" points="65.61715719826601,313.6436230892083 55.97079625827058,313.6436230892083 55.97079625827058,316.9016655258955" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.785,-0.29999999999999993 3.6340000000000003,-0.29999999999999993 3.6340000000000003,-0.24899999999999994" data-type="line" data-label="" points="394.4835545297173,297.3802654356607 384.7247547605309,297.3802654356607 384.7247547605309,294.08424697057126" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.4,-0.6 1.551,-0.6 1.551,-0.651" data-type="line" data-label="" points="244.49007529089664,313.6436230892083 254.13643623089206,313.6436230892083 254.13643623089206,316.9016655258955" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.4,0.6 1.551,0.6 1.551,0.651" data-type="line" data-label="" points="240.34622042700522,239.2152336987882 250.1050201961916,239.2152336987882 250.1050201961916,235.91921523369876" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.4,0.6 1.501,0.6 1.501,1.001" data-type="line" data-label="" points="244.49007529089664,236.98380104950945 250.94227697923793,236.98380104950945 250.94227697923793,211.36664385124342" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="59.38834391229081" y="213.3641084824004" width="180.95787651471443" height="129.25562608193889" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="65.61715719826601" y="211.43052703627652" width="178.87291809263064" height="127.76637006616474" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01565357142857143" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="4.785" data-y="-0.3999999999999999" x="394.4835545297173" y="245.67801500288513" width="129.25562608193883" height="116.33006347374496" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="4.785" data-y="-0.3999999999999999" x="396.8514715947981" y="243.37211955281768" width="127.76637006616465" height="114.98973305954829" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01565357142857143" />
+    <rect data-type="rect" data-label="schematic_component_2" data-x="6.7" data-y="-0.9499999999999993" x="565.7472590882863" y="303.8430467397576" width="34.25274091171377" height="71.09059434506634" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_2" data-x="6.7" data-y="-0.9499999999999993" x="566.1419119324663" y="300.8669860825918" width="33.858088067533686" height="70.27150353639058" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01565357142857143" />
+    <rect data-type="rect" data-label="schematic_component_3" data-x="2.8699999999999997" data-y="-1.75" x="318.22273514137333" y="355.5452971725332" width="34.25274091171383" height="71.09059434506634" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_3" data-x="2.8699999999999997" data-y="-1.75" x="321.4693132557609" y="351.9735341090577" width="33.85808806753363" height="70.27150353639058" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01565357142857143" />
-  </g>
-  <g>
-    <rect data-type="rect" data-label="schematic_component_4" data-x="2.9752723250000006" data-y="0.050000000000000266" x="334.91957608943653" y="236.98380104950942" width="20.407825233858034" height="70.27150353639061" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01565357142857143" />
+    <rect data-type="rect" data-label="schematic_component_4" data-x="2.9752723250000006" data-y="0.050000000000000266" x="331.82977541834975" y="239.21523369878818" width="20.64570063473741" height="71.09059434506636" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
 globalConnNetId: connectivity_net3
-available orientations: y-" data-x="-1.551" data-y="-0.801" x="49.58247775496234" y="316.9016655258955" width="12.776637006616482" height="19.16495550992471" fill="#00000066" stroke="#000000" stroke-width="0.01565357142857143" />
+available orientations: y-" data-x="-1.5999999999999999" data-y="-1.3499999999999999" x="39.999999999999986" y="355.5452971725332" width="12.9255626081939" height="19.388343912290793" fill="#00000066" stroke="#000000" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
 globalConnNetId: connectivity_net3
-available orientations: y-" data-x="1.551" data-y="-0.801" x="247.7481177275838" y="316.9016655258955" width="12.776637006616511" height="19.16495550992471" fill="#00000066" stroke="#000000" stroke-width="0.01565357142857143" />
+available orientations: y-" data-x="2.8699999999999997" data-y="-2.65" x="328.88632429313327" y="439.56145412579343" width="12.9255626081939" height="19.38834391229085" fill="#00000066" stroke="#000000" stroke-width="0.015473214285714283" />
   </g>
   <g>
-    <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net3
-available orientations: y-" data-x="2.8699999999999997" data-y="-2.65" x="332.0100387862194" y="435.0216746520648" width="12.776637006616511" height="19.164955509924653" fill="#00000066" stroke="#000000" stroke-width="0.01565357142857143" />
+    <rect data-type="rect" data-label="netId: VIN
+globalConnNetId: connectivity_net1
+available orientations: y+" data-x="2.8699999999999997" data-y="-1.0490000000000002" x="328.88632429313327" y="336.09232544720135" width="12.9255626081939" height="19.38834391229085" fill="#ef444466" stroke="#ef4444" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VIN
 globalConnNetId: connectivity_net1
-available orientations: y+" data-x="-1.6004999999999998" data-y="0.75" x="46.42026009582477" y="217.81884553958474" width="12.776637006616482" height="19.16495550992471" fill="#ef444466" stroke="#ef4444" stroke-width="0.01565357142857143" />
+available orientations: y+" data-x="3.6340000000000003" data-y="-0.09899999999999995" x="378.261973456434" y="274.6959030582804" width="12.9255626081939" height="19.38834391229085" fill="#ef444466" stroke="#ef4444" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VIN
 globalConnNetId: connectivity_net1
-available orientations: y+" data-x="2.9752723250000006" data-y="0.9500000000000005" x="338.7351702030573" y="205.04220853296823" width="12.776637006616454" height="19.16495550992471" fill="#ef444466" stroke="#ef4444" stroke-width="0.01565357142857143" />
+available orientations: y+" data-x="-1.5999999999999999" data-y="1.3499999999999999" x="39.999999999999986" y="181.05020196191572" width="12.9255626081939" height="19.38834391229082" fill="#ef444466" stroke="#ef4444" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VOUT
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="6.2425" data-y="7.771561172376096e-16" x="547.4560803102897" y="262.53707506274236" width="12.776637006616397" height="25.553274013232908" fill="#ef444466" stroke="#ef4444" stroke-width="0.01565357142857143" />
+available orientations: y+" data-x="6.7" data-y="7.771561172376096e-16" x="576.4108482400462" y="265.0663589151759" width="12.9255626081939" height="25.8511252163878" fill="#ef444466" stroke="#ef4444" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VOUT
 globalConnNetId: connectivity_net0
-available orientations: y+" data-x="1.501" data-y="1.2009999999999998" x="244.5539584759297" y="185.8133698380105" width="12.776637006616482" height="25.553274013232937" fill="#ef444466" stroke="#ef4444" stroke-width="0.01565357142857143" />
+available orientations: y+" data-x="1.551" data-y="0.851" x="243.64223889209464" y="210.068090017311" width="12.925562608193871" height="25.85112521638777" fill="#ef444466" stroke="#ef4444" stroke-width="0.015473214285714283" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: LDO_EN
 globalConnNetId: connectivity_net2
-available orientations: x-, x+" data-x="2.675272325000001" data-y="-0.5999999999999999" x="306.79357768651613" y="307.25530458590003" width="38.32991101984936" height="12.776637006616511" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01565357142857143" />
+available orientations: x-, x+" data-x="2.675272325000001" data-y="-0.5999999999999999" x="303.3759379111368" y="310.30582804385455" width="38.7766878245817" height="12.9255626081939" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.015473214285714283" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -267,12 +264,12 @@ available orientations: x-, x+" data-x="2.675272325000001" data-y="-0.5999999999
 
       // Calculate real coordinates using inverse transformation
       const matrix = {
-        "a": 63.88318503308236,
+        "a": 64.62781304096943,
         "c": 0,
-        "e": 155.05361624458132,
+        "e": 149.867282169648,
         "b": 0,
-        "d": -63.88318503308236,
-        "f": 275.31371206935887
+        "d": -64.62781304096943,
+        "f": 277.99192152336985
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute:
diff --git a/tests/examples/__snapshots__/example27.snap.svg b/tests/examples/__snapshots__/example27.snap.svg
index 584ffe28..a4dd1618 100644
--- a/tests/examples/__snapshots__/example27.snap.svg
+++ b/tests/examples/__snapshots__/example27.snap.svg
@@ -171,10 +171,7 @@ orientation: y-" data-x="-1.3" data-y="-0.10000000000000009" cx="240.86956521739
     <polyline data-points="0.2,1.4 3.4,-0.7" data-type="line" data-label="" points="332.17391304347825,228.69565217391306 526.9565217391305,356.5217391304348" fill="none" stroke="hsl(199, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="0,-1.4 0,-1.5999999999999999 -1.7,-1.5999999999999999 -1.7,-0.8999999999999999 -3.4,-0.8999999999999999" data-type="line" data-label="" points="320,399.1304347826087 320,411.304347826087 216.52173913043475,411.304347826087 216.52173913043475,368.69565217391306 113.04347826086953,368.69565217391306" fill="none" stroke="black" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="3.4,-0.8999999999999999 1.6999999999999997,-0.8999999999999999 1.6999999999999997,-1.5999999999999999 0,-1.5999999999999999 0,-1.4" data-type="line" data-label="" points="526.9565217391305,368.69565217391306 423.47826086956525,368.69565217391306 423.47826086956525,411.304347826087 320,411.304347826087 320,399.1304347826087" fill="none" stroke="black" stroke-width="1" />
+    <polyline data-points="-3.4,-0.8999999999999999 -1.7,-0.8999999999999999 -1.7,-1.5999999999999999 0,-1.5999999999999999 0,-1.4" data-type="line" data-label="" points="113.04347826086953,368.69565217391306 216.52173913043475,368.69565217391306 216.52173913043475,411.304347826087 320,411.304347826087 320,399.1304347826087" fill="none" stroke="black" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="-3.4,-0.49999999999999994 -1.3,-0.5" data-type="line" data-label="" points="113.04347826086953,344.3478260869565 240.8695652173913,344.3478260869565" fill="none" stroke="black" stroke-width="1" />
diff --git a/tests/solvers/MspConnectionPairSolver/MspConnectionPairSolver_repro79.test.ts b/tests/solvers/MspConnectionPairSolver/MspConnectionPairSolver_repro79.test.ts
new file mode 100644
index 00000000..1fa3dac4
--- /dev/null
+++ b/tests/solvers/MspConnectionPairSolver/MspConnectionPairSolver_repro79.test.ts
@@ -0,0 +1,72 @@
+import { test, expect } from "bun:test"
+import type { InputProblem } from "lib/types/InputProblem"
+import { MspConnectionPairSolver } from "lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver"
+
+/**
+ * Regression test for issue #79.
+ *
+ * When a net (e.g. VCC) connects pins A.1 and B.1 via netConnections, and A.1 is
+ * also part of a direct wire connection, the shared-reference bug in
+ * getConnectivityMapsFromInputProblem caused B.1 to be merged into the direct-wire
+ * net — resulting in spurious MSP pairs (and therefore spurious wire traces) that
+ * included B.1.
+ *
+ * After the fix (cloning directConnMap.netMap before passing to netConnMap), the
+ * direct-wire net only contains A.1 and A.2. B.1 is only reachable via the global
+ * (net-label) connectivity and should NOT generate a wire trace.
+ */
+test("MspConnectionPairSolver_repro79 - no spurious pairs for net-label-only pins", () => {
+  // A.1 and A.2 are directly wired (should produce exactly one MSP pair)
+  // VCC net labels connect A.1 and B.1 (B.1 should NOT get a wire trace)
+  const inputProblem: InputProblem = {
+    chips: [
+      {
+        chipId: "A",
+        center: { x: 0, y: 0 },
+        width: 1,
+        height: 1,
+        pins: [
+          { pinId: "A.1", x: -0.5, y: 0 },
+          { pinId: "A.2", x: 0.5, y: 0 },
+        ],
+      },
+      {
+        chipId: "B",
+        center: { x: 3, y: 0 },
+        width: 1,
+        height: 1,
+        pins: [{ pinId: "B.1", x: 2.5, y: 0 }],
+      },
+    ],
+    directConnections: [
+      // Direct wire: A.1 -- A.2
+      { pinIds: ["A.1", "A.2"] },
+    ],
+    netConnections: [
+      // VCC label: connects A.1 and B.1 (no wire trace should be added for B.1)
+      { netId: "VCC", pinIds: ["A.1", "B.1"] },
+    ],
+    availableNetLabelOrientations: {
+      VCC: ["x+", "x-", "y+", "y-"],
+    },
+  }
+
+  const solver = new MspConnectionPairSolver({ inputProblem })
+  solver.solve()
+
+  expect(solver.solved).toBe(true)
+
+  // Only the direct wire pair A.1--A.2 should exist.
+  // B.1 must NOT appear in any MSP pair since it is connected only via net label.
+  const pairPinIds = solver.mspConnectionPairs.flatMap((p) =>
+    p.pins.map((pin) => pin.pinId),
+  )
+
+  expect(pairPinIds).not.toContain("B.1")
+
+  // Exactly one pair: A.1 <-> A.2
+  expect(solver.mspConnectionPairs).toHaveLength(1)
+  const pair = solver.mspConnectionPairs[0]!
+  const pairIds = pair.pins.map((p) => p.pinId).sort()
+  expect(pairIds).toEqual(["A.1", "A.2"])
+})