diff --git a/lib/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.ts b/lib/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.ts
new file mode 100644
index 00000000..cbe3ee66
--- /dev/null
+++ b/lib/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.ts
@@ -0,0 +1,160 @@
+import type { Point } from "@tscircuit/math-utils"
+import { BaseSolver } from "../BaseSolver/BaseSolver"
+import type { SolvedTracePath } from "../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+
+export interface SameNetTraceMergeSolverParams {
+  traces: SolvedTracePath[]
+  /**
+   * Maximum distance between two trace endpoints to consider them mergeable.
+   * Default: 0.12 units.
+   */
+  maxEndpointGap?: number
+}
+
+function dist(a: Point, b: Point): number {
+  return Math.hypot(a.x - b.x, a.y - b.y)
+}
+
+/** Net key for grouping – prefer user-defined net id, fall back to connectivity ids */
+function netKey(trace: SolvedTracePath): string {
+  return trace.userNetId ?? trace.globalConnNetId ?? trace.dcConnNetId
+}
+
+/** Remove exact duplicate consecutive points */
+function dedupe(pts: Point[]): Point[] {
+  const out: Point[] = []
+  for (const p of pts) {
+    const prev = out[out.length - 1]
+    if (
+      !prev ||
+      Math.abs(prev.x - p.x) > 1e-9 ||
+      Math.abs(prev.y - p.y) > 1e-9
+    ) {
+      out.push(p)
+    }
+  }
+  return out
+}
+
+/**
+ * Try to merge two same-net traces by finding the closest endpoint pair.
+ * If the join requires a direction change, a single right-angle bridge is inserted.
+ * Returns the merged SolvedTracePath or null if the gap exceeds maxGap.
+ */
+function tryMerge(
+  a: SolvedTracePath,
+  b: SolvedTracePath,
+  maxGap: number,
+): SolvedTracePath | null {
+  const pa = a.tracePath
+  const pb = b.tracePath
+  if (pa.length === 0 || pb.length === 0) return null
+
+  const aS = pa[0]!
+  const aE = pa[pa.length - 1]!
+  const bS = pb[0]!
+  const bE = pb[pb.length - 1]!
+
+  const options = [
+    { d: dist(aE, bS), revA: false, revB: false },
+    { d: dist(aE, bE), revA: false, revB: true },
+    { d: dist(aS, bS), revA: true, revB: false },
+    { d: dist(aS, bE), revA: true, revB: true },
+  ]
+  const best = options.reduce((p, c) => (c.d < p.d ? c : p))
+  if (best.d > maxGap) return null
+
+  const ordA = best.revA ? [...pa].reverse() : [...pa]
+  const ordB = best.revB ? [...pb].reverse() : [...pb]
+
+  const from = ordA[ordA.length - 1]!
+  const to = ordB[0]!
+
+  // Insert a single L-shaped bridge if the connection is not axis-aligned
+  const bridge: Point[] =
+    Math.abs(from.x - to.x) > 1e-9 && Math.abs(from.y - to.y) > 1e-9
+      ? [{ x: to.x, y: from.y }]
+      : []
+
+  return {
+    ...a,
+    mspPairId: `merged:${a.mspPairId}+${b.mspPairId}`,
+    tracePath: dedupe([...ordA, ...bridge, ...ordB]),
+    mspConnectionPairIds: [
+      ...a.mspConnectionPairIds,
+      ...b.mspConnectionPairIds,
+    ],
+    pinIds: [...a.pinIds, ...b.pinIds],
+  }
+}
+
+/**
+ * SameNetTraceMergeSolver — pipeline phase that joins trace segments belonging
+ * to the same electrical net when their endpoints are within `maxEndpointGap`
+ * units of each other.
+ *
+ * Runs iteratively until no more merges are possible (or the solver is marked
+ * solved/failed by the base class iteration guard).
+ */
+export class SameNetTraceMergeSolver extends BaseSolver {
+  readonly inputTraces: SolvedTracePath[]
+  outputTraces: SolvedTracePath[]
+  readonly maxEndpointGap: number
+  /** Total number of merges performed across all _step() calls */
+  mergeCount = 0
+
+  constructor({
+    traces,
+    maxEndpointGap = 0.12,
+  }: SameNetTraceMergeSolverParams) {
+    super()
+    this.inputTraces = [...traces]
+    this.outputTraces = [...traces]
+    this.maxEndpointGap = maxEndpointGap
+  }
+
+  getOutput(): { traces: SolvedTracePath[] } {
+    return { traces: this.outputTraces }
+  }
+
+  override _step(): void {
+    // Group current traces by net
+    const byNet = new Map<string, SolvedTracePath[]>()
+    for (const trace of this.outputTraces) {
+      const k = netKey(trace)
+      const group = byNet.get(k)
+      if (group) group.push(trace)
+      else byNet.set(k, [trace])
+    }
+
+    let merged = false
+
+    for (const group of byNet.values()) {
+      if (group.length < 2) continue
+
+      // O(n²) scan – groups are typically small
+      outer: for (let i = 0; i < group.length; i++) {
+        for (let j = i + 1; j < group.length; j++) {
+          const joined = tryMerge(group[i]!, group[j]!, this.maxEndpointGap)
+          if (joined) {
+            // Replace the two original traces with the merged one
+            this.outputTraces = this.outputTraces.filter(
+              (t) =>
+                t.mspPairId !== group[i]!.mspPairId &&
+                t.mspPairId !== group[j]!.mspPairId,
+            )
+            this.outputTraces.push(joined)
+            this.mergeCount++
+            merged = true
+            break outer // Restart the scan for this net
+          }
+        }
+      }
+    }
+
+    if (!merged) {
+      // No more mergeable pairs – we're done
+      this.solved = true
+    }
+  }
+}
diff --git a/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts b/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
index 59821f0c..4ea4788e 100644
--- a/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
+++ b/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
@@ -21,6 +21,7 @@ import { expandChipsToFitPins } from "./expandChipsToFitPins"
 import { LongDistancePairSolver } from "../LongDistancePairSolver/LongDistancePairSolver"
 import { MergedNetLabelObstacleSolver } from "../TraceLabelOverlapAvoidanceSolver/sub-solvers/LabelMergingSolver/LabelMergingSolver"
 import { TraceCleanupSolver } from "../TraceCleanupSolver/TraceCleanupSolver"
+import { SameNetTraceMergeSolver } from "../SameNetTraceMergeSolver/SameNetTraceMergeSolver"
 import { Example28Solver } from "../Example28Solver/Example28Solver"
 import { AvailableNetOrientationSolver } from "../AvailableNetOrientationSolver/AvailableNetOrientationSolver"
 import { VccNetLabelCornerPlacementSolver } from "../VccNetLabelCornerPlacementSolver/VccNetLabelCornerPlacementSolver"
@@ -75,6 +76,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
   labelMergingSolver?: MergedNetLabelObstacleSolver
   traceLabelOverlapAvoidanceSolver?: TraceLabelOverlapAvoidanceSolver
   traceCleanupSolver?: TraceCleanupSolver
+  sameNetTraceMergeSolver?: SameNetTraceMergeSolver
   example28Solver?: Example28Solver
   availableNetOrientationSolver?: AvailableNetOrientationSolver
   vccNetLabelCornerPlacementSolver?: VccNetLabelCornerPlacementSolver
@@ -217,11 +219,24 @@ export class SchematicTracePipelineSolver extends BaseSolver {
         },
       ]
     }),
+    definePipelineStep(
+      "sameNetTraceMergeSolver",
+      SameNetTraceMergeSolver,
+      (instance) => {
+        const traces =
+          instance.sameNetTraceMergeSolver?.getOutput().traces ??
+          instance.traceCleanupSolver?.getOutput().traces ??
+          instance.traceLabelOverlapAvoidanceSolver!.getOutput().traces
+        return [{ traces }]
+      },
+    ),
     definePipelineStep(
       "netLabelPlacementSolver",
       NetLabelPlacementSolver,
       (instance) => {
         const traces =
+          instance.sameNetTraceMergeSolver?.getOutput().traces ??
+          instance.sameNetTraceMergeSolver?.getOutput().traces ??
           instance.traceCleanupSolver?.getOutput().traces ??
           instance.traceLabelOverlapAvoidanceSolver!.getOutput().traces
 
@@ -237,6 +252,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
     ),
     definePipelineStep("example28Solver", Example28Solver, (instance) => {
       const traces =
+        instance.sameNetTraceMergeSolver?.getOutput().traces ??
         instance.traceCleanupSolver?.getOutput().traces ??
         instance.traceLabelOverlapAvoidanceSolver!.getOutput().traces
 
diff --git a/tests/examples/__snapshots__/example01.snap.svg b/tests/examples/__snapshots__/example01.snap.svg
index 2614ba80..e185ca90 100644
--- a/tests/examples/__snapshots__/example01.snap.svg
+++ b/tests/examples/__snapshots__/example01.snap.svg
@@ -41,16 +41,16 @@ y+" data-x="-4" data-y="0.5" cx="67.72277227722776" cy="245.14851485148515" r="3
 y-" data-x="-4" data-y="-0.5" cx="67.72277227722776" cy="356.03960396039605" r="3" fill="hsl(3, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.1" data-y="0.20000000000000018" cx="389.3069306930693" cy="278.4158415841584" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.1" data-y="0.20000000000000018" cx="389.3069306930693" cy="278.4158415841584" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.275" data-y="0" cx="369.90099009900996" cy="300.5940594059406" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.275" data-y="0" cx="369.90099009900996" cy="300.5940594059406" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-1.4" data-y="-0.7" cx="356.0396039603961" cy="378.2178217821782" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.4" data-y="-0.7" cx="356.0396039603961" cy="378.2178217821782" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-4" data-y="-0.5" cx="67.72277227722776" cy="356.03960396039605" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <polyline data-points="-0.8,0.2 -2,0.5" data-type="line" data-label="" points="422.5742574257426,278.4158415841584 289.50495049504957,245.14851485148515" fill="none" stroke="hsl(190, 100%, 50%, 0.8)" stroke-width="1" />
@@ -74,10 +74,7 @@ orientation: y-" data-x="-1.4" data-y="-0.7" cx="356.0396039603961" cy="378.2178
     <polyline data-points="-0.7999999999999998,0 -1.275,0 -1.275,0.8000000000000002 -4,0.8000000000000002 -4,0.5" data-type="line" data-label="" points="422.57425742574264,300.5940594059406 369.90099009900996,300.5940594059406 369.90099009900996,211.88118811881185 67.72277227722776,211.88118811881185 67.72277227722776,245.14851485148515" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.8,-0.20000000000000018 -1.4,-0.20000000000000018 -1.4,-0.7 -2,-0.7 -2,-0.5" data-type="line" data-label="" points="422.5742574257426,322.7722772277228 356.0396039603961,322.7722772277228 356.0396039603961,378.2178217821782 289.50495049504957,378.2178217821782 289.50495049504957,356.03960396039605" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <polyline data-points="-4,-0.5 -4,-0.7000000000000002 -2,-0.7000000000000002 -2,-0.5" data-type="line" data-label="" points="67.72277227722776,356.03960396039605 67.72277227722776,378.21782178217825 289.50495049504957,378.21782178217825 289.50495049504957,356.03960396039605" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-0.8,-0.20000000000000018 -1.4,-0.20000000000000018 -1.4,-0.7 -2,-0.7 -2,-0.5 -2,-0.7000000000000002 -4,-0.7000000000000002 -4,-0.5" data-type="line" data-label="" points="422.5742574257426,322.7722772277228 356.0396039603961,322.7722772277228 356.0396039603961,378.2178217821782 289.50495049504957,378.2178217821782 289.50495049504957,356.03960396039605 289.50495049504957,378.21782178217825 67.72277227722776,378.21782178217825 67.72277227722776,356.03960396039605" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="422.5742574257426" y="267.3267326732673" width="177.4257425742574" height="66.53465346534654" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
@@ -90,18 +87,19 @@ orientation: y-" data-x="-1.4" data-y="-0.7" cx="356.0396039603961" cy="378.2178
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VCC
-globalConnNetId: connectivity_net0
-available orientations: y+" data-x="-1.1" data-y="0.42500000000000016" x="378.21782178217825" y="228.51485148514848" width="22.178217821782198" height="49.9009900990099" fill="#ef444466" stroke="#ef4444" stroke-width="0.009017857142857143" />
+globalConnNetId: connectivity_net0" data-x="-1.1" data-y="0.42500000000000016" x="378.21782178217825" y="228.51485148514848" width="22.178217821782198" height="49.9009900990099" fill="#ef444466" stroke="#ef4444" stroke-width="0.009017857142857143" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: EN
-globalConnNetId: connectivity_net1
-available orientations: x+, x-" data-x="-1.5" data-y="0" x="320" y="289.5049504950495" width="49.90099009900996" height="22.17821782178214" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
+globalConnNetId: connectivity_net1" data-x="-1.5" data-y="0" x="320" y="289.5049504950495" width="49.90099009900996" height="22.17821782178214" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net2" data-x="-1.4" data-y="-0.9249999999999999" x="344.950495049505" y="378.2178217821782" width="22.178217821782198" height="49.9009900990099" fill="#00000066" stroke="#000000" stroke-width="0.009017857142857143" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net2
-available orientations: y-" data-x="-1.4" data-y="-0.9249999999999999" x="344.950495049505" y="378.2178217821782" width="22.178217821782198" height="49.9009900990099" fill="#00000066" stroke="#000000" stroke-width="0.009017857142857143" />
+globalConnNetId: connectivity_net2" data-x="-4" data-y="-0.726" x="56.63366336633669" y="356.1504950495049" width="22.17821782178214" height="49.90099009900996" fill="#00000066" stroke="#000000" stroke-width="0.009017857142857143" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example02.snap.svg b/tests/examples/__snapshots__/example02.snap.svg
index 3815fdc0..cc0af8cd 100644
--- a/tests/examples/__snapshots__/example02.snap.svg
+++ b/tests/examples/__snapshots__/example02.snap.svg
@@ -53,20 +53,31 @@ x+" data-x="1" data-y="-0.1" cx="500.20151295522464" cy="341.11637364700744" r="
 x+" data-x="1" data-y="0.1" cx="500.20151295522464" cy="324.189420823755" r="3" fill="hsl(323, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.4574283249999997" data-y="1.3024186000000004" cx="292.2176463362275" cy="222.4230062437483" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.101" data-y="0.401" cx="322.38387354695703" cy="298.71435682475993" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-3.0434765500000003" data-y="-0.2000000000000004" cx="157.98282893633558" cy="349.5798500586337" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.9148566499999995" data-y="1.1024186000000005" cx="253.50330794975545" cy="239.34995906700078" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="1.9148566499999995" data-y="-1.0024186000000008" cx="577.6301897281687" cy="417.4923589921354" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-4.173189849999999" data-y="1.3024186000000004" cx="62.36981027183117" cy="222.4230062437483" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.4571549750000001" data-y="0.29999999999999966" cx="538.8927164289255" cy="307.26246800050245" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-2.301" data-y="-0.14900000000000002" cx="220.822156607442" cy="345.26347708870435" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-1.9143099500000003" data-y="-0.2000000000000004" cx="253.54957777529776" cy="349.5798500586337" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-4.17264315" data-y="-2.220446049250313e-16" cx="62.41608009737348" cy="332.6528972353812" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-3.0434765500000003" data-y="-2.220446049250313e-16" cx="157.98282893633558" cy="332.6528972353812" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.9148566499999995" data-y="-1.0024186000000008" cx="577.6301897281687" cy="417.4923589921354" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.4571549750000001" data-y="0.29999999999999966" cx="538.8927164289255" cy="307.26246800050245" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <polyline data-points="-1,0.2 -1.9148566499999995,1.1024186000000005" data-type="line" data-label="" points="330.93198472269955,315.7259444121287 253.50330794975545,239.34995906700078" fill="none" stroke="hsl(248, 100%, 50%, 0.8)" stroke-width="1" />
@@ -156,63 +167,70 @@ orientation: y+" data-x="1.4571549750000001" data-y="0.29999999999999966" cx="53
     <polyline data-points="1.9143099500000003,0.09999999999999964 1,0.1" data-type="line" data-label="" points="577.5839199026265,324.189420823755 500.20151295522464,324.189420823755" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-3.0440232499999995,1.1024186000000002 -3.0440232499999995,1.3024186000000004 -4.173189849999999,1.3024186000000004 -4.173189849999999,1.1024186000000002" data-type="line" data-label="" points="157.93655911079327,239.3499590670008 157.93655911079327,222.4230062437483 62.36981027183117,222.4230062437483 62.36981027183117,239.3499590670008" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1,0.1 1.4571549750000001,0.1 1.4571549750000001,0.29999999999999966 1.9143099500000003,0.29999999999999966 1.9143099500000003,0.09999999999999964" data-type="line" data-label="" points="500.20151295522464,324.189420823755 538.8927164289255,324.189420823755 538.8927164289255,307.26246800050245 577.5839199026265,307.26246800050245 577.5839199026265,324.189420823755" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.9148566499999995,1.1024186000000002 -1.9148566499999995,1.3024186000000004 -3.0440232499999995,1.3024186000000004 -3.0440232499999995,1.1024186000000002" data-type="line" data-label="" points="253.50330794975545,239.3499590670008 253.50330794975545,222.4230062437483 157.93655911079327,222.4230062437483 157.93655911079327,239.3499590670008" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,0 -1.0999999999999999,0 -1.0999999999999999,-0.09999999999999995 -1.9143099500000003,-0.09999999999999995 -1.9143099500000003,0 -1.9143099500000003,-0.2000000000000004 -3.0434765500000003,-0.2000000000000004 -3.0434765500000003,-2.220446049250313e-16 -3.0434765500000003,-0.2000000000000004 -4.17264315,-0.2000000000000004 -4.17264315,-2.220446049250313e-16" data-type="line" data-label="" points="330.93198472269955,332.6528972353812 322.4685083110733,332.6528972353812 322.4685083110733,341.11637364700744 253.54957777529776,341.11637364700744 253.54957777529776,332.6528972353812 253.54957777529776,349.5798500586337 157.98282893633558,349.5798500586337 157.98282893633558,332.6528972353812 157.98282893633558,349.5798500586337 62.41608009737348,349.5798500586337 62.41608009737348,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1,0.20000000000000018 -1.4574283249999997,0.20000000000000018 -1.4574283249999997,1.3024186000000004 -1.9148566499999995,1.3024186000000004 -1.9148566499999995,1.1024186000000005" data-type="line" data-label="" points="330.93198472269955,315.7259444121287 292.2176463362275,315.7259444121287 292.2176463362275,222.4230062437483 253.50330794975545,222.4230062437483 253.50330794975545,239.34995906700078" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-4.173189849999999,1.1024186000000002 -4.173189849999999,1.3024186000000004 -3.0440232499999995,1.3024186000000004 -3.0440232499999995,1.1024186000000002 -3.0440232499999995,1.3024186000000004 -1.9148566499999995,1.3024186000000004 -1.9148566499999995,1.1024186000000002 -1.9148566499999995,1.3024186000000004 -1.4574283249999997,1.3024186000000004 -1.4574283249999997,0.20000000000000018 -1,0.20000000000000018 -1.3,0.2 -1.3,-0.2 -1,-0.2" data-type="line" data-label="" points="62.36981027183117,239.3499590670008 62.36981027183117,222.4230062437483 157.93655911079327,222.4230062437483 157.93655911079327,239.3499590670008 157.93655911079327,222.4230062437483 253.50330794975545,222.4230062437483 253.50330794975545,239.3499590670008 253.50330794975545,222.4230062437483 292.2176463362275,222.4230062437483 292.2176463362275,315.7259444121287 330.93198472269955,315.7259444121287 305.5415554878208,315.7259444121287 305.5415554878208,349.5798500586337 330.93198472269955,349.5798500586337" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1,-0.2 -1.3,-0.2 -1.3,0.2 -1,0.2" data-type="line" data-label="" points="330.93198472269955,349.5798500586337 305.5415554878208,349.5798500586337 305.5415554878208,315.7259444121287 330.93198472269955,315.7259444121287" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,0.2 -1.101,0.2 -1.101,0.401" data-type="line" data-label="" points="330.93198472269955,315.7259444121287 322.38387354695703,315.7259444121287 322.38387354695703,298.71435682475993" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-3.0434765500000003,-2.220446049250313e-16 -3.0434765500000003,-0.2000000000000004 -4.17264315,-0.2000000000000004 -4.17264315,-2.220446049250313e-16" data-type="line" data-label="" points="157.98282893633558,332.6528972353812 157.98282893633558,349.5798500586337 62.41608009737348,349.5798500586337 62.41608009737348,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,-0.2 -2.301,-0.2 -2.301,-0.14900000000000002" data-type="line" data-label="" points="330.93198472269955,349.5798500586337 220.822156607442,349.5798500586337 220.822156607442,345.26347708870435" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.9143099500000003,-2.220446049250313e-16 -1.9143099500000003,-0.2000000000000004 -3.0434765500000003,-0.2000000000000004 -3.0434765500000003,-2.220446049250313e-16" data-type="line" data-label="" points="253.54957777529776,332.6528972353812 253.54957777529776,349.5798500586337 157.98282893633558,349.5798500586337 157.98282893633558,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="-1.9145832999999999" data-y="0.5512093000000002" x="231.13349767792428" y="239.34995906700078" width="44.78589036920462" height="93.30293816838042" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <polyline data-points="-1,0 -1.0999999999999999,0 -1.0999999999999999,-0.09999999999999995 -1.9143099500000003,-0.09999999999999995 -1.9143099500000003,0" data-type="line" data-label="" points="330.93198472269955,332.6528972353812 322.4685083110733,332.6528972353812 322.4685083110733,341.11637364700744 253.54957777529776,341.11637364700744 253.54957777529776,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="-4.1729164999999995" data-y="0.5512093" x="40" y="239.3499590670008" width="44.78589036920465" height="93.3029381683804" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <polyline data-points="1,0.1 1.4571549750000001,0.1 1.4571549750000001,0.29999999999999966 1.9143099500000003,0.29999999999999966 1.9143099500000003,0.09999999999999964" data-type="line" data-label="" points="500.20151295522464,324.189420823755 538.8927164289255,324.189420823755 538.8927164289255,307.26246800050245 577.5839199026265,307.26246800050245 577.5839199026265,324.189420823755" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_2" data-x="-3.0437499" data-y="0.5512093" x="135.5667488389621" y="239.3499590670008" width="44.78589036920465" height="93.3029381683804" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_0" data-x="-1.9145832999999999" data-y="0.5512093000000002" x="231.13349767792428" y="239.34995906700078" width="44.78589036920462" height="93.30293816838042" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="schematic_component_3" data-x="1.9145832999999999" data-y="-0.4512093000000006" x="555.2141096307953" y="324.189420823755" width="44.785890369204594" height="93.30293816838042" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="-4.1729164999999995" data-y="0.5512093" x="40" y="239.3499590670008" width="44.78589036920465" height="93.3029381683804" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="schematic_component_4" data-x="0" data-y="0" x="330.93198472269955" y="298.7989915888762" width="169.2695282325251" height="67.70781129300997" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_2" data-x="-3.0437499" data-y="0.5512093" x="135.5667488389621" y="239.3499590670008" width="44.78589036920465" height="93.3029381683804" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="netId: VSYS
+globalConnNetId: connectivity_net0" data-x="-1.101" data-y="0.626" x="313.9203971353308" y="260.6287129724418" width="16.92695282325252" height="38.08564385231813" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_3" data-x="1.9145832999999999" data-y="-0.4512093000000006" x="555.2141096307953" y="324.189420823755" width="44.785890369204594" height="93.30293816838042" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="netId: VSYS
+globalConnNetId: connectivity_net0" data-x="-1.9148566499999995" data-y="1.3284186000000004" x="245.0398315381292" y="201.1796804505664" width="16.92695282325252" height="38.08564385231816" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_4" data-x="0" data-y="0" x="330.93198472269955" y="298.7989915888762" width="169.2695282325251" height="67.70781129300997" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="netId: VSYS
+globalConnNetId: connectivity_net0" data-x="-4.173189849999999" data-y="1.5274186000000005" x="53.90633386020494" y="184.33736239143013" width="16.926952823252464" height="38.08564385231816" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VSYS
-globalConnNetId: connectivity_net0
-available orientations: y+" data-x="-1.4574283249999997" data-y="1.5274186000000005" x="283.75416992460123" y="184.33736239143013" width="16.926952823252577" height="38.08564385231816" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
+globalConnNetId: connectivity_net0" data-x="-2.301" data-y="0.07599999999999998" x="212.35868019581574" y="307.17783323638616" width="16.92695282325252" height="38.085643852318185" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net1" data-x="-1.9143099500000003" data-y="-0.4250000000000004" x="245.0861013636715" y="349.5798500586337" width="16.92695282325252" height="38.085643852318185" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net1" data-x="-4.17264315" data-y="-0.22600000000000023" x="53.95260368574725" y="332.7375319994975" width="16.926952823252407" height="38.08564385231813" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net1
-available orientations: y-" data-x="-3.0434765500000003" data-y="-0.4250000000000004" x="149.51935252470935" y="349.5798500586337" width="16.926952823252492" height="38.085643852318185" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
+globalConnNetId: connectivity_net1" data-x="-3.0434765500000003" data-y="-0.22600000000000023" x="149.51935252470935" y="332.7375319994975" width="16.926952823252492" height="38.08564385231813" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net1
-available orientations: y-" data-x="1.9148566499999995" data-y="-1.2284186000000008" x="569.1667133165424" y="417.5769937562517" width="16.926952823252577" height="38.08564385231813" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
+globalConnNetId: connectivity_net1" data-x="1.9148566499999995" data-y="-1.2284186000000008" x="569.1667133165424" y="417.5769937562517" width="16.926952823252577" height="38.08564385231813" fill="#00000066" stroke="#000000" stroke-width="0.011815475714285715" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V3_3
-globalConnNetId: connectivity_net2
-available orientations: y+" data-x="1.4571549750000001" data-y="0.5249999999999997" x="530.4292400172993" y="269.1768241481843" width="16.926952823252464" height="38.08564385231813" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
+globalConnNetId: connectivity_net2" data-x="1.4571549750000001" data-y="0.5249999999999997" x="530.4292400172993" y="269.1768241481843" width="16.926952823252464" height="38.08564385231813" fill="#ef444466" stroke="#ef4444" stroke-width="0.011815475714285715" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example13.snap.svg b/tests/examples/__snapshots__/example13.snap.svg
index 3fe23640..d7f49cb3 100644
--- a/tests/examples/__snapshots__/example13.snap.svg
+++ b/tests/examples/__snapshots__/example13.snap.svg
@@ -77,36 +77,34 @@ x-" data-x="3.435" data-y="3" cx="513.5461404526988" cy="157.49274521183986" r="
 x+" data-x="4.5649999999999995" data-y="3" cx="586.9994196169471" cy="157.49274521183986" r="3" fill="hsl(58, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="3.75" data-y="-1.5" cx="534.022054556007" cy="450.0058038305282" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.7009999999999998" data-y="0.699" cx="400.83110853163083" cy="307.0644225188625" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-2.125" data-y="-1.9999999999999998" cx="152.1300058038305" cy="482.5072547881602" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-2.125" data-y="-1.9999999999999998" cx="152.1300058038305" cy="482.5072547881602" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.475" data-y="0" cx="386.1404526987812" cy="352.5014509576321" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="3.75" data-y="-1.5" cx="534.022054556007" cy="450.0058038305282" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.301" data-y="-1.074" cx="205.69239698200812" cy="422.31456761462573" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.475" data-y="0" cx="386.1404526987812" cy="352.5014509576321" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-2.125" data-y="0" cx="152.1300058038305" cy="352.5014509576321" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.301" data-y="-1.074" cx="205.69239698200812" cy="422.31456761462573" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </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)" />
+    <circle data-type="point" data-label="" data-x="-2.125" data-y="0" cx="152.1300058038305" cy="352.5014509576321" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="2.2990000000000004" data-y="0.051000000000000004" cx="439.7028438769588" cy="349.1863029599536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-3.651" data-y="0.201" cx="52.93557748113753" cy="339.435867672664" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.96375" data-y="3" cx="417.91062100986653" cy="157.49274521183986" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-3.75" data-y="2" cx="46.500290191526375" cy="222.49564712710392" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="2.2990000000000004" data-y="0.051000000000000004" cx="439.7028438769588" cy="349.1863029599536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.96375" data-y="3" cx="417.91062100986653" cy="157.49274521183986" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <polyline data-points="-3.55,0 -1.15,1.125" data-type="line" data-label="" points="59.50087057457921,352.5014509576321 215.507835171213,279.37318630296" fill="none" stroke="hsl(40, 100%, 50%, 0.8)" stroke-width="1" />
@@ -193,37 +191,37 @@ 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" />
+    <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" />
   </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,-1.9999999999999998 -3.75,-1.9999999999999998 -3.75,-0.9999999999999999 -2.25,-0.9999999999999999 -2.25,0 -2.45,0" data-type="line" data-label="" points="59.50087057457921,482.5072547881602 46.500290191526375,482.5072547881602 46.500290191526375,417.5043528728961 144.0046430644225,417.5043528728961 144.0046430644225,352.5014509576321 131.00406268136967,352.5014509576321" 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" />
+    <polyline data-points="4.5649999999999995,3 4.765,3 4.765,0 3.55,0" data-type="line" data-label="" points="586.9994196169471,157.49274521183986 600,157.49274521183986 600,352.5014509576321 521.0214741729542,352.5014509576321" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-3.55,-1.9999999999999998 -3.75,-1.9999999999999998 -3.75,-0.9999999999999999 -2.25,-0.9999999999999999 -2.25,0 -2.45,0" data-type="line" data-label="" points="59.50087057457921,482.5072547881602 46.500290191526375,482.5072547881602 46.500290191526375,417.5043528728961 144.0046430644225,417.5043528728961 144.0046430644225,352.5014509576321 131.00406268136967,352.5014509576321" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.45,-1.9999999999999998 -1.8,-1.9999999999999998 -1.8,-0.375 -1.15,-0.375" data-type="line" data-label="" points="131.00406268136967,482.5072547881602 173.25594892629132,482.5072547881602 173.25594892629132,376.8775391758561 215.507835171213,376.8775391758561" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.55,0 3.75,0 3.75,-1.5 3.55,-1.5" data-type="line" data-label="" points="521.0214741729542,352.5014509576321 534.022054556007,352.5014509576321 534.022054556007,450.0058038305282 521.0214741729542,450.0058038305282" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.15,0 1.8,0 1.8,-1.5 2.45,-1.5" data-type="line" data-label="" points="365.01450957632034,352.5014509576321 407.266395821242,352.5014509576321 407.266395821242,450.0058038305282 449.5182820661637,450.0058038305282" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.15,0.75 3.75,0.75 3.75,0 3.55,0" data-type="line" data-label="" points="365.01450957632034,303.749274521184 534.022054556007,303.749274521184 534.022054556007,352.5014509576321 521.0214741729542,352.5014509576321" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.435,3 0.49249999999999994,3 0.49249999999999994,2 -2.45,2" data-type="line" data-label="" points="513.5461404526988,157.49274521183986 322.2751015670342,157.49274521183986 322.2751015670342,222.49564712710392 131.00406268136967,222.49564712710392" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="4.5649999999999995,3 4.765,3 4.765,0 3.55,0" data-type="line" data-label="" points="586.9994196169471,157.49274521183986 600,157.49274521183986 600,352.5014509576321 521.0214741729542,352.5014509576321" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.1500000000000004,1.125 -3.75,1.125 -3.75,2 -3.55,2 -3.75,2 -3.75,0 -3.55,0" data-type="line" data-label="" points="215.50783517121295,279.37318630296 46.500290191526375,279.37318630296 46.500290191526375,222.49564712710392 59.50087057457921,222.49564712710392 46.500290191526375,222.49564712710392 46.500290191526375,352.5014509576321 59.50087057457921,352.5014509576321" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.45,-1.9999999999999998 -1.8,-1.9999999999999998 -1.8,-0.375 -1.15,-0.375" data-type="line" data-label="" points="131.00406268136967,482.5072547881602 173.25594892629132,482.5072547881602 173.25594892629132,376.8775391758561 215.507835171213,376.8775391758561" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.55,-1.5 3.75,-1.5 3.75,0 3.55,0 3.75,0 3.75,0.75 1.15,0.75" data-type="line" data-label="" points="521.0214741729542,450.0058038305282 534.022054556007,450.0058038305282 534.022054556007,352.5014509576321 521.0214741729542,352.5014509576321 534.022054556007,352.5014509576321 534.022054556007,303.749274521184 365.01450957632034,303.749274521184" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.15,0 1.8,0 1.8,-1.5 2.45,-1.5" data-type="line" data-label="" points="365.01450957632034,352.5014509576321 407.266395821242,352.5014509576321 407.266395821242,450.0058038305282 449.5182820661637,450.0058038305282" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.15,0.75 1.7009999999999998,0.75 1.7009999999999998,0.699" data-type="line" data-label="" points="365.01450957632034,303.749274521184 400.83110853163083,303.749274521184 400.83110853163083,307.0644225188625" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.435,3 0.49249999999999994,3 0.49249999999999994,2 -2.45,2" data-type="line" data-label="" points="513.5461404526988,157.49274521183986 322.2751015670342,157.49274521183986 322.2751015670342,222.49564712710392 131.00406268136967,222.49564712710392" fill="none" stroke="purple" stroke-width="1" />
+    <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="-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" />
+    <polyline data-points="-3.55,0 -3.651,0 -3.651,0.201" data-type="line" data-label="" points="59.50087057457921,352.5014509576321 52.93557748113753,352.5014509576321 52.93557748113753,339.435867672664" 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" />
@@ -251,43 +249,43 @@ orientation: y+" data-x="1.96375" data-y="3" cx="417.91062100986653" cy="157.492
   </g>
   <g>
     <rect data-type="rect" data-label="netId: gnd
-globalConnNetId: connectivity_net3
-available orientations: y-" data-x="3.75" data-y="-1.725" x="527.5217643644805" y="450.0058038305282" width="13.000580383052807" height="29.251305861868843" fill="#00000066" stroke="#000000" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net3" data-x="1.7009999999999998" data-y="0.474" x="394.33081834010443" y="307.0644225188625" width="13.000580383052807" height="29.251305861868843" fill="#00000066" stroke="#000000" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: gnd
-globalConnNetId: connectivity_net3
-available orientations: y-" data-x="-2.125" data-y="-2.2249999999999996" x="145.6297156123041" y="482.5072547881602" width="13.000580383052835" height="29.251305861868843" fill="#00000066" stroke="#000000" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net3" data-x="-2.125" data-y="-2.2249999999999996" x="145.6297156123041" y="482.5072547881602" width="13.000580383052835" height="29.251305861868843" fill="#00000066" stroke="#000000" stroke-width="0.015383928571428571" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: gnd
+globalConnNetId: connectivity_net3" data-x="3.75" data-y="-1.725" x="527.5217643644805" y="450.0058038305282" width="13.000580383052807" height="29.251305861868843" fill="#00000066" stroke="#000000" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: v5
-globalConnNetId: connectivity_net4
-available orientations: y+" data-x="1.475" data-y="0.225" x="379.6401625072548" y="323.25014509576323" width="13.000580383052807" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net4" data-x="1.475" data-y="0.225" x="379.6401625072548" y="323.25014509576323" width="13.000580383052807" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: v5
-globalConnNetId: connectivity_net4
-available orientations: y+" data-x="-1.301" data-y="-0.8490000000000001" x="199.19210679048172" y="393.0632617527569" width="13.000580383052807" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net4" data-x="-1.301" data-y="-0.8490000000000001" x="199.19210679048172" y="393.0632617527569" width="13.000580383052807" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: .PWR1 &gt; .FB to .R6 &gt; .pin2
-globalConnNetId: connectivity_net2
-available orientations: any" data-x="-2.125" data-y="0.225" x="145.6297156123041" y="323.25014509576323" width="13.000580383052835" height="29.251305861868843" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net2" data-x="-2.125" data-y="0.225" x="145.6297156123041" y="323.25014509576323" width="13.000580383052835" height="29.251305861868843" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.015383928571428571" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: v3_3
+globalConnNetId: connectivity_net0" data-x="-3.651" data-y="0.42600000000000005" x="46.435287289611125" y="310.1845618107952" 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.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" />
+globalConnNetId: connectivity_net0" 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" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: v3_3
-globalConnNetId: connectivity_net0
-available orientations: y+" data-x="2.2990000000000004" data-y="0.276" x="433.20255368543235" y="319.93499709808475" width="13.000580383052863" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net0" data-x="2.2990000000000004" data-y="0.276" x="433.20255368543235" y="319.93499709808475" width="13.000580383052863" height="29.251305861868843" fill="#ef444466" stroke="#ef4444" stroke-width="0.015383928571428571" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: .LED1 &gt; .pos to .R8 &gt; .pin2
-globalConnNetId: connectivity_net1
-available orientations: any" data-x="1.96375" data-y="3.225" x="411.41033081834007" y="128.241439349971" width="13.000580383052807" height="29.25130586186887" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.015383928571428571" />
+globalConnNetId: connectivity_net1" data-x="1.96375" data-y="3.225" x="411.41033081834007" y="128.241439349971" width="13.000580383052807" height="29.25130586186887" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.015383928571428571" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example14.snap.svg b/tests/examples/__snapshots__/example14.snap.svg
index b91ea230..4b64cfad 100644
--- a/tests/examples/__snapshots__/example14.snap.svg
+++ b/tests/examples/__snapshots__/example14.snap.svg
@@ -73,36 +73,31 @@ y-" data-x="1.2000000000000002" data-y="1.1500000000000001" cx="419.076923076923
 y+" data-x="1.2000000000000002" data-y="2.25" cx="419.07692307692315" cy="98.15384615384613" r="3" fill="hsl(349, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="1.3510000000000002" data-y="-0.35100000000000003" cx="432.08615384615393" cy="322.24" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.3010000000000002" data-y="-0.5010000000000001" cx="427.7784615384616" cy="335.1630769230769" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-1.2000000000000002" data-y="-2.45" cx="212.30769230769232" cy="503.0769230769231" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.2000000000000002" data-y="-2.45" cx="212.30769230769232" cy="503.0769230769231" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.4000000000000001" data-y="-0.30000000000000004" cx="195.0769230769231" cy="317.84615384615387" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.4000000000000001" data-y="-0.30000000000000004" cx="195.0769230769231" cy="317.84615384615387" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.4000000000000001" data-y="0.09999999999999998" cx="436.3076923076924" cy="283.38461538461536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.4000000000000001" data-y="0.09999999999999998" cx="436.3076923076924" cy="283.38461538461536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.3010000000000002" data-y="0.5010000000000001" cx="203.60615384615386" cy="248.83692307692306" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.3010000000000002" data-y="0.5010000000000001" cx="203.60615384615386" cy="248.83692307692306" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="3.2" data-y="0.30000000000000004" cx="591.3846153846155" cy="266.15384615384613" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="3.2" data-y="0.30000000000000004" cx="591.3846153846155" cy="266.15384615384613" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.5500000000000003" data-y="0.10000000000000003" cx="182.15384615384616" cy="283.38461538461536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.5500000000000003" data-y="0.10000000000000003" cx="182.15384615384616" cy="283.38461538461536" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="1.4755000000000003" data-y="-1.2944553500000002" cx="442.81230769230774" cy="403.5223070769231" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.5500000000000003" data-y="-0.10000000000000003" cx="449.2307692307693" cy="300.61538461538464" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.2000000000000002" data-y="-1.2944553500000002" cx="419.07692307692315" cy="403.5223070769231" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <polyline data-points="-1.2000000000000002,0.10000000000000003 -1.9000000000000004,0.10000000000000002" data-type="line" data-label="" points="212.30769230769232,283.38461538461536 152,283.38461538461536" fill="none" stroke="hsl(296, 100%, 50%, 0.8)" stroke-width="1" />
@@ -155,9 +150,6 @@ orientation: y+" data-x="1.4755000000000003" data-y="-1.2944553500000002" cx="44
   <g>
     <polyline data-points="0.09999999999999987,-1.2944553500000002 -0.55,-1.2944553500000002 -0.55,-0.9500000000000002 -1.2000000000000002,-0.9500000000000002 -1.2000000000000002,-1.1500000000000001" data-type="line" data-label="" points="324.3076923076923,403.5223070769231 268.3076923076923,403.5223070769231 268.3076923076923,373.84615384615387 212.30769230769232,373.84615384615387 212.30769230769232,391.0769230769231" fill="none" stroke="purple" stroke-width="1" />
   </g>
-  <g>
-    <polyline data-points="1.2000000000000002,-0.10000000000000003 1.9000000000000004,-0.10000000000000002" data-type="line" data-label="" points="419.07692307692315,300.61538461538464 479.3846153846155,300.61538461538464" fill="none" stroke="purple" stroke-width="1" />
-  </g>
   <g>
     <polyline data-points="1.2000000000000002,0.09999999999999998 1.4000000000000001,0.09999999999999998 1.4000000000000001,0.625 1.2000000000000002,0.625 1.2000000000000002,1.1500000000000001" data-type="line" data-label="" points="419.07692307692315,283.38461538461536 436.3076923076924,283.38461538461536 436.3076923076924,238.15384615384613 419.07692307692315,238.15384615384613 419.07692307692315,192.9230769230769" fill="none" stroke="purple" stroke-width="1" />
   </g>
@@ -168,10 +160,10 @@ orientation: y+" data-x="1.4755000000000003" data-y="-1.2944553500000002" cx="44
     <polyline data-points="-1.2000000000000002,-2.25 -1.2000000000000002,-2.45 -3.2,-2.45 -3.2,0.10000000000000016 -3,0.10000000000000016" data-type="line" data-label="" points="212.30769230769232,485.84615384615387 212.30769230769232,503.0769230769231 40,503.0769230769231 40,283.38461538461536 57.23076923076928,283.38461538461536" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.2000000000000002,-1.2944553500000002 1.7510000000000003,-1.2944553500000002 1.7510000000000003,-0.10000000000000003 1.2000000000000002,-0.10000000000000003" data-type="line" data-label="" points="419.07692307692315,403.5223070769231 466.5476923076924,403.5223070769231 466.5476923076924,300.61538461538464 419.07692307692315,300.61538461538464" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.9000000000000004,-0.10000000000000002 1.2000000000000002,-0.10000000000000003 1.7510000000000003,-0.10000000000000003 1.7510000000000003,-1.2944553500000002 1.2000000000000002,-1.2944553500000002" data-type="line" data-label="" points="479.3846153846155,300.61538461538464 419.07692307692315,300.61538461538464 466.5476923076924,300.61538461538464 466.5476923076924,403.5223070769231 419.07692307692315,403.5223070769231" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.2000000000000002,-0.30000000000000004 1.3510000000000002,-0.30000000000000004 1.3510000000000002,-0.35100000000000003" data-type="line" data-label="" points="419.07692307692315,317.84615384615387 432.08615384615393,317.84615384615387 432.08615384615393,322.24" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.2000000000000002,-0.30000000000000004 1.3010000000000002,-0.30000000000000004 1.3010000000000002,-0.5010000000000001" data-type="line" data-label="" points="419.07692307692315,317.84615384615387 427.7784615384616,317.84615384615387 427.7784615384616,335.1630769230769" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="-1.2000000000000002,0.30000000000000004 -1.3010000000000002,0.30000000000000004 -1.3010000000000002,0.5010000000000001" data-type="line" data-label="" points="212.30769230769232,266.15384615384613 203.60615384615386,266.15384615384613 203.60615384615386,248.83692307692306" fill="none" stroke="purple" stroke-width="1" />
@@ -196,43 +188,39 @@ orientation: y+" data-x="1.4755000000000003" data-y="-1.2944553500000002" cx="44
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net4
-available orientations: y-" data-x="1.3510000000000002" data-y="-0.5760000000000001" x="423.4707692307693" y="322.24" width="17.230769230769226" height="38.769230769230774" fill="#00000066" stroke="#000000" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net4" data-x="1.3010000000000002" data-y="-0.7260000000000001" x="419.16307692307697" y="335.1630769230769" width="17.230769230769226" height="38.769230769230774" fill="#00000066" stroke="#000000" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net4
-available orientations: y-" data-x="-1.2000000000000002" data-y="-2.6750000000000003" x="203.6923076923077" y="503.0769230769231" width="17.230769230769255" height="38.76923076923083" fill="#00000066" stroke="#000000" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net4" data-x="-1.2000000000000002" data-y="-2.6750000000000003" x="203.6923076923077" y="503.0769230769231" width="17.230769230769255" height="38.76923076923083" fill="#00000066" stroke="#000000" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: U1.THRES to U1.TRIG
-globalConnNetId: connectivity_net1
-available orientations: any" data-x="-1.6250000000000002" data-y="-0.30000000000000004" x="156.30769230769232" y="309.2307692307692" width="38.769230769230774" height="17.230769230769226" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net1" data-x="-1.6250000000000002" data-y="-0.30000000000000004" x="156.30769230769232" y="309.2307692307692" width="38.769230769230774" height="17.230769230769226" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: U1.OUT to R3.pin1
-globalConnNetId: connectivity_net3
-available orientations: any" data-x="1.6250000000000002" data-y="0.09999999999999998" x="436.3076923076924" y="274.7692307692308" width="38.769230769230774" height="17.230769230769226" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net3" data-x="1.6250000000000002" data-y="0.09999999999999998" x="436.3076923076924" y="274.7692307692308" width="38.769230769230774" height="17.230769230769226" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VCC
-globalConnNetId: connectivity_net5
-available orientations: y+" data-x="-1.3010000000000002" data-y="0.7260000000000001" x="194.99076923076925" y="210.0676923076923" width="17.230769230769255" height="38.769230769230745" fill="#ef444466" stroke="#ef4444" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net5" data-x="-1.3010000000000002" data-y="0.7260000000000001" x="194.99076923076925" y="210.0676923076923" width="17.230769230769255" height="38.769230769230745" fill="#ef444466" stroke="#ef4444" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: VCC
-globalConnNetId: connectivity_net5
-available orientations: y+" data-x="3.2" data-y="0.525" x="582.7692307692308" y="227.3846153846154" width="17.230769230769283" height="38.769230769230745" fill="#ef444466" stroke="#ef4444" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net5" data-x="3.2" data-y="0.525" x="582.7692307692308" y="227.3846153846154" width="17.230769230769283" height="38.769230769230745" fill="#ef444466" stroke="#ef4444" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: U1.CTRL to C2.pin1
-globalConnNetId: connectivity_net0
-available orientations: any" data-x="-1.5500000000000003" data-y="0.32500000000000007" x="173.53846153846155" y="244.6153846153846" width="17.230769230769226" height="38.769230769230745" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net0" data-x="-1.5500000000000003" data-y="0.32500000000000007" x="173.53846153846155" y="244.6153846153846" width="17.230769230769226" height="38.769230769230745" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: U1.DISCH to R2.pin1
+globalConnNetId: connectivity_net2" data-x="1.5500000000000003" data-y="-0.32500000000000007" x="440.6153846153847" y="300.61538461538464" width="17.230769230769226" height="38.769230769230774" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: U1.DISCH to R2.pin1
-globalConnNetId: connectivity_net2
-available orientations: any" data-x="1.4755000000000003" data-y="-1.0694553500000001" x="434.19692307692316" y="364.7530763076923" width="17.230769230769226" height="38.769230769230774" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
+globalConnNetId: connectivity_net2" data-x="1.4260000000000002" data-y="-1.2944553500000002" x="419.16307692307697" y="394.9069224615385" width="38.769230769230774" height="17.230769230769226" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011607142857142856" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example15.snap.svg b/tests/examples/__snapshots__/example15.snap.svg
index 5d1b2f9d..09c1de65 100644
--- a/tests/examples/__snapshots__/example15.snap.svg
+++ b/tests/examples/__snapshots__/example15.snap.svg
@@ -317,40 +317,73 @@ y+" data-x="-2.025" data-y="-1.6000000000000003" cx="318.5204755614267" cy="471.
 y-" data-x="-2.025" data-y="-2.7" cx="318.5204755614267" cy="526.0237780713342" r="3" fill="hsl(111, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-1.3099999999999998" data-y="1.2000000000000015" cx="353.7824746807574" cy="333.6856010568031" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.3099999999999998" data-y="1.2000000000000015" cx="353.7824746807574" cy="333.6856010568031" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </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)" />
+    <circle data-type="point" data-label="" data-x="-1.5675" data-y="6.505000000000002" cx="341.08322324966974" 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="-1.3099999999999998" data-y="2.8000000000000016" cx="353.7824746807574" cy="254.77763099955962" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-0.6374999999999998" data-y="6.505000000000002" cx="386.94848084544253" 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="-3.7550000000000003" data-y="3.9683333333333355" cx="233.2012329370322" cy="197.15837369734325" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.4109999999999998" data-y="1.6510000000000014" cx="348.8014090708939" cy="311.44341699691756" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-2.025" data-y="-1.4000000000000004" cx="318.5204755614267" cy="461.9110523998238" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" 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: x-" data-x="-2.025" data-y="2.200000000000001" cx="318.5204755614267" cy="284.36811977102593" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.511" data-y="0.651000000000001" cx="343.86966094231616" cy="360.76089828269477" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="0.29250000000000076" data-y="5.205000000000002" cx="432.8137384412153" cy="136.16908850726549" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="2.152500000000001" data-y="6.705000000000002" cx="524.5442536327608" 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="-3.7550000000000003" data-y="2.4683333333333346" cx="233.2012329370322" cy="271.13459562600906" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.6109999999999998" data-y="1.1010000000000009" cx="338.9379128137385" cy="338.56803170409506" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="-2.49" data-y="-2.9000000000000004" cx="295.5878467635403" cy="535.8872743284896" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.7109999999999999" data-y="0.2510000000000006" cx="334.00616468516074" cy="380.48789079700566" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.9525000000000015" data-y="6.705000000000002" cx="514.6807573756055" cy="62.19286657859976" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-1.3099999999999998" data-y="2.8000000000000016" cx="353.7824746807574" cy="254.77763099955962" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-3.7550000000000003" data-y="3.9683333333333355" cx="233.2012329370322" cy="197.15837369734325" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" 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="" data-x="-2.025" data-y="-1.4000000000000004" cx="318.5204755614267" cy="461.9110523998238" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-2.025" data-y="2.200000000000001" cx="318.5204755614267" cy="284.36811977102593" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-2.4975" data-y="5.205000000000002" cx="295.21796565389695" cy="136.16908850726549" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-2.2975000000000003" data-y="5.205000000000002" cx="305.08146191105243" cy="136.16908850726549" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="0.2925000000000005" data-y="5.405000000000002" cx="432.8137384412153" cy="126.30559225011007" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.2225000000000006" data-y="5.405000000000002" cx="478.6789960369881" cy="126.30559225011007" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="2.1525000000000007" data-y="5.405000000000002" cx="524.5442536327608" cy="126.30559225011007" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-3.7550000000000003" data-y="2.4683333333333346" cx="233.2012329370322" cy="271.13459562600906" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-6.415" data-y="2.6683333333333357" cx="102.01673271686491" cy="261.2710993688536" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="-2.49" data-y="-2.9000000000000004" cx="295.5878467635403" cy="535.8872743284896" r="3" fill="hsl(80, 100%, 50%, 0.9)" />
   </g>
   <g>
     <polyline data-points="-1.1099999999999999,1.2000000000000015 -1.5675,6.505000000000002" data-type="line" data-label="" points="363.6459709379128,333.6856010568031 341.08322324966974,72.05636283575518" fill="none" stroke="hsl(280, 100%, 50%, 0.8)" stroke-width="1" />
@@ -776,154 +809,171 @@ 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" />
+    <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" />
   </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" />
+    <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="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" />
+    <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="-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,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="-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="-3.7550000000000003,3.7683333333333353 -3.7550000000000003,3.9683333333333355 -4.6850000000000005,3.9683333333333355 -4.6850000000000005,3.7683333333333353 -4.6850000000000005,3.9683333333333355 -6.415,3.9683333333333355 -6.415,3.7683333333333353" data-type="line" data-label="" points="233.2012329370322,207.0218699544987 233.2012329370322,197.15837369734325 187.3359753412594,197.15837369734325 187.3359753412594,207.0218699544987 187.3359753412594,197.15837369734325 102.01673271686491,197.15837369734325 102.01673271686491,207.0218699544987" 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="-3.7550000000000003,2.668333333333335 -3.7550000000000003,2.4683333333333346 -4.6850000000000005,2.4683333333333346 -4.6850000000000005,2.668333333333335 -4.6850000000000005,2.4683333333333346 -6.415,2.4683333333333346 -6.415,2.6683333333333357" data-type="line" data-label="" points="233.2012329370322,261.2710993688536 233.2012329370322,271.13459562600906 187.3359753412594,271.13459562600906 187.3359753412594,261.2710993688536 187.3359753412594,271.13459562600906 102.01673271686491,271.13459562600906 102.01673271686491,261.2710993688536" 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.5675,5.405000000000002 -1.5675,5.205000000000002 -0.6375000000000002,5.205000000000002 -0.6375000000000002,5.405000000000002 -0.6374999999999998,5.205000000000002 0.29250000000000076,5.205000000000002 0.29250000000000076,5.405000000000002 0.2925000000000005,5.205000000000002 1.222500000000001,5.205000000000002 1.2225000000000006,5.405000000000002 1.2225000000000006,5.205000000000002 2.152500000000001,5.205000000000002 2.152500000000001,5.405000000000002" data-type="line" data-label="" points="295.21796565389695,126.30559225011007 295.21796565389695,136.16908850726549 341.0832232496698,136.16908850726549 341.08322324966974,126.30559225011007 341.08322324966974,136.16908850726549 386.94848084544253,136.16908850726549 386.94848084544253,126.30559225011007 386.94848084544253,136.16908850726549 432.8137384412153,136.16908850726549 432.8137384412153,126.30559225011007 432.8137384412153,136.16908850726549 478.6789960369881,136.16908850726549 478.6789960369881,126.30559225011007 478.6789960369881,136.16908850726549 524.5442536327608,136.16908850726549 524.5442536327608,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="2.152500000000001,6.505000000000002 2.152500000000001,6.705000000000002 1.2225000000000006,6.705000000000002 1.222500000000001,6.505000000000002 1.222500000000001,6.705000000000002 0.29250000000000037,6.705000000000002 0.29250000000000037,6.505000000000002 0.29250000000000076,6.705000000000002 -0.6374999999999998,6.705000000000002 -0.6375000000000002,6.505000000000002 -0.6375000000000002,6.705000000000002 -1.5675,6.705000000000002 -1.5674999999999994,6.505000000000002 -1.5674999999999994,6.705000000000002 -2.4975,6.705000000000002 -2.4975,6.505000000000002" data-type="line" data-label="" points="524.5442536327608,72.05636283575518 524.5442536327608,62.19286657859976 478.6789960369881,62.19286657859976 478.6789960369881,72.05636283575518 478.6789960369881,62.19286657859976 432.8137384412153,62.19286657859976 432.8137384412153,72.05636283575518 432.8137384412153,62.19286657859976 386.94848084544253,62.19286657859976 386.94848084544253,72.05636283575518 386.94848084544253,62.19286657859976 341.08322324966974,62.19286657859976 341.0832232496698,72.05636283575518 341.0832232496698,62.19286657859976 295.21796565389695,62.19286657859976 295.21796565389695,72.05636283575518" 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.1099999999999999,1.2000000000000015 -1.3099999999999998,1.2000000000000015 -1.3099999999999998,1.0000000000000013 -1.1099999999999999,1.0000000000000013 -1.3099999999999998,1.0000000000000013 -1.3099999999999998,0.8000000000000012 -1.1099999999999999,0.8000000000000012 -1.3099999999999998,0.8000000000000012 -1.3099999999999998,0.600000000000001 -1.1099999999999999,0.600000000000001 -1.3099999999999998,0.600000000000001 -1.3099999999999998,0.4000000000000008 -1.1099999999999999,0.4000000000000008 -1.3099999999999998,0.4000000000000008 -1.3099999999999998,0.20000000000000062 -1.1099999999999999,0.20000000000000062" data-type="line" data-label="" points="363.6459709379128,333.6856010568031 353.7824746807574,333.6856010568031 353.7824746807574,343.54909731395855 363.6459709379128,343.54909731395855 353.7824746807574,343.54909731395855 353.7824746807574,353.412593571114 363.6459709379128,353.412593571114 353.7824746807574,353.412593571114 353.7824746807574,363.2760898282694 363.6459709379128,363.2760898282694 353.7824746807574,363.2760898282694 353.7824746807574,373.13958608542487 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="-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="-1.1099999999999999,0.8000000000000012 -1.4109999999999998,0.8000000000000012 -1.4109999999999998,1.6510000000000014" data-type="line" data-label="" points="363.6459709379128,353.412593571114 348.8014090708939,353.412593571114 348.8014090708939,311.44341699691756" 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="-1.1099999999999999,0.600000000000001 -1.511,0.600000000000001 -1.511,0.651000000000001" data-type="line" data-label="" points="363.6459709379128,363.2760898282694 343.86966094231616,363.2760898282694 343.86966094231616,360.76089828269477" 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="-1.1099999999999999,0.4000000000000008 -1.6109999999999998,0.4000000000000008 -1.6109999999999998,1.1010000000000009" data-type="line" data-label="" points="363.6459709379128,373.13958608542487 338.9379128137385,373.13958608542487 338.9379128137385,338.56803170409506" 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,0.20000000000000062 -1.7109999999999999,0.20000000000000062 -1.7109999999999999,0.2510000000000006" data-type="line" data-label="" points="363.6459709379128,383.0030823425803 334.00616468516074,383.0030823425803 334.00616468516074,380.48789079700566" 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" />
+    <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" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="-1.5675" data-y="5.955000000000002" x="328.0140907089388" y="72.05636283575518" width="26.138265081461952" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_2" data-x="-0.6374999999999998" data-y="5.955000000000002" x="373.8793483047116" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_3" data-x="-2.4975" data-y="5.955000000000002" x="282.148833113166" y="72.05636283575518" width="26.138265081461952" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_4" data-x="0.2925000000000004" data-y="5.955000000000002" x="419.7446059004844" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_5" data-x="1.2225000000000006" data-y="5.955000000000002" x="465.60986349625716" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_6" data-x="2.1525000000000007" data-y="5.955000000000002" x="511.4751210920299" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_7" data-x="-4.6850000000000005" data-y="3.218333333333335" x="174.26684280052848" y="207.0218699544987" width="26.138265081461867" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_8" data-x="-3.7550000000000003" data-y="3.218333333333335" x="220.1321003963012" y="207.0218699544987" width="26.138265081461924" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </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" />
+    <rect data-type="rect" data-label="schematic_component_9" data-x="-6.415" data-y="3.2183333333333355" x="88.94760017613396" y="207.0218699544987" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="-1.5675" data-y="5.955000000000002" x="328.0140907089388" y="72.05636283575518" width="26.138265081461952" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="schematic_component_10" data-x="-2.025" data-y="1.450000000000001" x="305.45134302069573" y="294.2316160281814" width="26.138265081461896" height="54.24922941435483" fill="hsl(320, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_2" data-x="-0.6374999999999998" data-y="5.955000000000002" x="373.8793483047116" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="schematic_component_11" data-x="-2.025" data-y="-2.1500000000000004" x="305.45134302069573" y="471.7745486569793" width="26.138265081461896" height="54.249229414354886" fill="hsl(320, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_3" data-x="-2.4975" data-y="5.955000000000002" x="282.148833113166" y="72.05636283575518" width="26.138265081461952" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.3099999999999998" data-y="1.4250000000000016" x="348.85072655217965" y="311.4927344782034" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_4" data-x="0.2925000000000004" data-y="5.955000000000002" x="419.7446059004844" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.5675" data-y="6.731000000000002" x="336.15147512109206" 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="schematic_component_5" data-x="1.2225000000000006" data-y="5.955000000000002" x="465.60986349625716" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-0.6374999999999998" data-y="6.731000000000002" x="382.0167327168648" 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="schematic_component_6" data-x="2.1525000000000007" data-y="5.955000000000002" x="511.4751210920299" y="72.05636283575518" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.4109999999999998" data-y="1.8760000000000014" x="343.86966094231616" y="289.25055041831786" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_7" data-x="-4.6850000000000005" data-y="3.218333333333335" x="174.26684280052848" y="207.0218699544987" width="26.138265081461867" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" 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="schematic_component_8" data-x="-3.7550000000000003" data-y="3.218333333333335" x="220.1321003963012" y="207.0218699544987" width="26.138265081461924" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.511" data-y="0.876000000000001" x="338.9379128137384" y="338.56803170409506" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_9" data-x="-6.415" data-y="3.2183333333333355" x="88.94760017613396" y="207.0218699544987" width="26.138265081461896" height="54.249229414354886" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="2.152500000000001" data-y="6.9300000000000015" x="519.6125055041832" y="40.00000000000006" width="9.863496257155361" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_10" data-x="-2.025" data-y="1.450000000000001" x="305.45134302069573" y="294.2316160281814" width="26.138265081461896" height="54.24922941435483" fill="hsl(320, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.6109999999999998" data-y="1.326000000000001" x="334.00616468516074" y="316.3751651254953" width="9.863496257155418" height="22.192866578599762" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_11" data-x="-2.025" data-y="-2.1500000000000004" x="305.45134302069573" y="471.7745486569793" width="26.138265081461896" height="54.249229414354886" fill="hsl(320, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020276785714285723" />
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="-1.7109999999999999" data-y="0.47600000000000064" x="329.074416556583" y="358.29502421840596" 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="-1.3099999999999998" data-y="1.4250000000000016" x="348.85072655217965" y="311.4927344782034" width="9.863496257155475" height="22.192866578599705" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net0" data-x="1.9525000000000015" data-y="6.9300000000000015" x="509.74900924702774" y="40.00000000000006" 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="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" />
+    <rect data-type="rect" data-label="netId: V1_1
+globalConnNetId: connectivity_net6" data-x="-1.3099999999999998" data-y="3.0250000000000017" x="348.85072655217965" y="232.58476442095986" width="9.863496257155475" height="22.192866578599762" 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="-1.3099999999999998" data-y="3.0250000000000017" x="348.85072655217965" y="232.58476442095986" width="9.863496257155475" height="22.192866578599762" fill="#ef444466" stroke="#ef4444" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net6" 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" />
   </g>
   <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" />
+globalConnNetId: connectivity_net6" 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
-globalConnNetId: connectivity_net9
-available orientations: any" data-x="-2.25" data-y="-1.4000000000000004" x="296.327608982827" y="456.97930427124606" width="22.192866578599705" height="9.863496257155475" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net9" data-x="-2.25" data-y="-1.4000000000000004" x="296.327608982827" y="456.97930427124606" width="22.192866578599705" height="9.863496257155475" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: capacitor.C10 &gt; port.pin1 to U3.VREG_VIN
-globalConnNetId: connectivity_net8
-available orientations: any" data-x="-2.25" data-y="2.200000000000001" x="296.327608982827" y="279.4363716424482" width="22.192866578599705" height="9.863496257155475" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net8" data-x="-2.25" data-y="2.200000000000001" x="296.327608982827" y="279.4363716424482" width="22.192866578599705" height="9.863496257155475" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net10" data-x="-2.4975" data-y="4.980000000000002" x="290.2862175253193" y="136.16908850726549" width="9.863496257155418" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net10" data-x="-2.2975000000000003" data-y="4.980000000000002" x="300.1497137824747" y="136.16908850726549" width="9.863496257155418" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net10" data-x="0.2925000000000005" data-y="5.179000000000002" x="427.8819903126376" y="126.35490973139588" width="9.863496257155418" height="22.192866578599677" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net10" data-x="1.2225000000000006" data-y="5.179000000000002" x="473.7472479084104" y="126.35490973139588" width="9.863496257155418" height="22.192866578599677" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net10" data-x="2.1525000000000007" data-y="5.179000000000002" x="519.6125055041831" y="126.35490973139588" width="9.863496257155475" height="22.192866578599677" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net10
-available orientations: y-" data-x="0.29250000000000076" data-y="4.980000000000002" x="427.8819903126376" y="136.16908850726549" width="9.863496257155475" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net10" data-x="-3.7550000000000003" data-y="2.2433333333333345" x="228.26948480845445" y="271.13459562600906" width="9.863496257155447" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net10
-available orientations: y-" data-x="-3.7550000000000003" data-y="2.2433333333333345" x="228.26948480845445" y="271.13459562600906" width="9.863496257155447" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net10" data-x="-6.415" data-y="2.4423333333333357" x="97.08498458828723" y="261.32041685013934" width="9.863496257155418" height="22.192866578599762" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net10
-available orientations: y-" data-x="-2.49" data-y="-3.1250000000000004" x="290.6560986349626" y="535.8872743284896" width="9.863496257155418" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
+globalConnNetId: connectivity_net10" data-x="-2.49" data-y="-3.1250000000000004" x="290.6560986349626" y="535.8872743284896" width="9.863496257155418" height="22.192866578599705" fill="#00000066" stroke="#000000" stroke-width="0.020276785714285723" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example18.snap.svg b/tests/examples/__snapshots__/example18.snap.svg
index 8c7f05fc..69f4e95e 100644
--- a/tests/examples/__snapshots__/example18.snap.svg
+++ b/tests/examples/__snapshots__/example18.snap.svg
@@ -65,24 +65,22 @@ y-" data-x="1.7580660749999977" data-y="-3.3025814000000002" cx="494.02875093834
 y+" data-x="1.757519574999999" data-y="-2.2" cx="493.97982495355666" cy="501.29024555523955" 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)" />
+    <circle data-type="point" data-label="" data-x="-1.8574283249999997" data-y="0.7512093000000004" cx="170.34782867681724" cy="237.0801425024461" 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)" />
+    <circle data-type="point" data-label="" data-x="1.7580660749999977" data-y="2.5025814000000004" cx="494.0287509383446" cy="80.28672123449769" 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)" />
+    <circle data-type="point" data-label="" data-x="1.7009999999999998" data-y="-0.449" cx="488.91985081507386" cy="344.53013692944967" 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)" />
+    <circle data-type="point" data-label="" data-x="-2.31430995" data-y="-0.7512093000000004" cx="129.44502275784095" cy="371.58574098183345" 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)" />
+    <circle data-type="point" data-label="" data-x="1.757519574999999" data-y="0.85" cx="493.97982495355666" cy="228.23580163253305" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.757519574999999" data-y="-2" cx="493.97982495355666" cy="483.385036117685" 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" />
@@ -136,19 +134,19 @@ orientation: x+" data-x="1.757519574999999" data-y="-2" cx="493.97982495355666"
     <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" />
   </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="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" />
   </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="493.97982495355666,196.90168511681264 493.97982495355666,259.56991814825346 461.9725106115543,259.56991814825346" 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="493.97982495355666,501.29024555523955 493.97982495355666,483.385036117685 179.29226414378866,483.385036117685 179.29226414378866,501.29024555523955" 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.7580660749999977,2.3025814000000002 1.7580660749999977,2.5025814000000004 1.5790330374999988,2.5025814000000004 1.5790330374999988,-0.3 1.4,-0.3 1.5999999999999999,-0.3 1.5999999999999999,-0.5 1.4,-0.5" data-type="line" data-label="" points="494.0287509383446,98.19193067205222 494.0287509383446,80.28672123449769 478.0006307749495,80.28672123449769 478.0006307749495,331.1907558984716 461.9725106115543,331.1907558984716 479.8777200491088,331.1907558984716 479.8777200491088,349.0959653360261 461.9725106115543,349.0959653360261" 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" />
+    <polyline data-points="1.4,-0.5 1.7009999999999998,-0.5 1.7009999999999998,-0.449" data-type="line" data-label="" points="461.9725106115543,349.0959653360261 488.91985081507386,349.0959653360261 488.91985081507386,344.53013692944967" 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="211.29957848579102" y="241.66470871069896" width="250.67293212576328" height="125.33646606288164" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011169933571428573" />
@@ -167,28 +165,27 @@ orientation: x+" data-x="1.757519574999999" data-y="-2" cx="493.97982495355666"
   </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" />
+globalConnNetId: connectivity_net0" 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" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net0" data-x="1.7580660749999977" data-y="2.7275814000000005" x="485.07614621956736" y="40" width="17.90520943755456" height="40.28672123449769" fill="#ef444466" stroke="#ef4444" stroke-width="0.011169933571428573" />
   </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" />
+globalConnNetId: connectivity_net0" data-x="1.7009999999999998" data-y="-0.224" x="479.9672460962966" y="304.24341569495203" width="17.90520943755456" height="40.286721234497634" fill="#ef444466" stroke="#ef4444" stroke-width="0.011169933571428573" />
   </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" />
+globalConnNetId: connectivity_net1" 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" />
   </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" />
+globalConnNetId: connectivity_net2" 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" />
   </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" />
+globalConnNetId: connectivity_net3" 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" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
diff --git a/tests/examples/__snapshots__/example19.snap.svg b/tests/examples/__snapshots__/example19.snap.svg
index ac5ba82d..aff7e3bd 100644
--- a/tests/examples/__snapshots__/example19.snap.svg
+++ b/tests/examples/__snapshots__/example19.snap.svg
@@ -2,146 +2,150 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="U1.6
-x+" data-x="0.6000000000000001" data-y="-0.2" cx="160.00000000000003" cy="359.23793250000006" r="3" fill="hsl(324, 100%, 50%, 0.8)" />
+x+" data-x="0.6000000000000001" data-y="-0.2" cx="160.00000000000003" cy="359.26525749999996" r="3" fill="hsl(324, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.8
-x+" data-x="0.6000000000000001" data-y="0" cx="160.00000000000003" cy="339.23793250000006" r="3" fill="hsl(326, 100%, 50%, 0.8)" />
+x+" data-x="0.6000000000000001" data-y="0" cx="160.00000000000003" cy="339.26525749999996" r="3" fill="hsl(326, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.1
-x+" data-x="0.6000000000000001" data-y="0.2" cx="160.00000000000003" cy="319.23793250000006" r="3" fill="hsl(319, 100%, 50%, 0.8)" />
+x+" data-x="0.6000000000000001" data-y="0.2" cx="160.00000000000003" cy="319.26525749999996" r="3" fill="hsl(319, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C2.1
-y-" data-x="1.4002733499999995" data-y="-0.0012093000000001908" cx="240.027335" cy="339.3588625000001" r="3" fill="hsl(2, 100%, 50%, 0.8)" />
+y-" data-x="1.4002733499999995" data-y="-0.0012093000000001908" cx="240.027335" cy="339.3861875" r="3" fill="hsl(2, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C2.2
-y+" data-x="1.3997266500000003" data-y="1.1012093000000003" cx="239.97266500000006" cy="229.1170025" r="3" fill="hsl(3, 100%, 50%, 0.8)" />
+y+" data-x="1.3997266500000003" data-y="1.1012093000000003" cx="239.97266500000006" cy="229.14432749999992" r="3" fill="hsl(3, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R1.1
-x-" data-x="2.1487092999999997" data-y="1.3002732499999994" cx="314.87093" cy="209.21060750000012" r="3" fill="hsl(226, 100%, 50%, 0.8)" />
+x-" data-x="2.1487092999999997" data-y="1.3002732499999994" cx="314.87093" cy="209.23793250000003" r="3" fill="hsl(226, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R1.2
-x+" data-x="3.2512907000000006" data-y="1.2997267500000007" cx="425.12907000000007" cy="209.2652575" r="3" fill="hsl(227, 100%, 50%, 0.8)" />
+x+" data-x="3.2512907000000006" data-y="1.2997267500000007" cx="425.12907000000007" cy="209.2925824999999" r="3" fill="hsl(227, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="JP5.1
-x-" data-x="3.8000000000000003" data-y="0" cx="480" cy="339.23793250000006" r="3" fill="hsl(242, 100%, 50%, 0.8)" />
+x-" data-x="3.8000000000000003" data-y="0" cx="480" cy="339.26525749999996" r="3" fill="hsl(242, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="JP9.1
-x-" data-x="3.8000000000000003" data-y="-0.9" cx="480" cy="429.23793250000006" r="3" fill="hsl(126, 100%, 50%, 0.8)" />
+x-" data-x="3.8000000000000003" data-y="-0.9" cx="480" cy="429.26525749999996" r="3" fill="hsl(126, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="JP8.1
-x+" data-x="2.4458007999999998" data-y="-1.2015872704999997" cx="344.58008" cy="459.39665955000004" r="3" fill="hsl(245, 100%, 50%, 0.8)" />
+x+" data-x="2.4458007999999998" data-y="-1.2015872704999997" cx="344.58008" cy="459.42398454999994" r="3" fill="hsl(245, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="JP8.2
-y+" data-x="2.0034928" data-y="-0.8350319000000007" cx="300.34928" cy="422.74112250000013" r="3" fill="hsl(246, 100%, 50%, 0.8)" />
+y+" data-x="2.0034928" data-y="-0.8350319000000007" cx="300.34928" cy="422.76844750000004" r="3" fill="hsl(246, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="JP8.3
-x-" data-x="1.5541992" data-y="-1.2014628704999997" cx="255.41992000000002" cy="459.38421955" r="3" fill="hsl(247, 100%, 50%, 0.8)" />
+x-" data-x="1.5541992" data-y="-1.2014628704999997" cx="255.41992000000002" cy="459.4115445499999" r="3" fill="hsl(247, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="2.0034928" data-y="-0.46751595000000035" cx="300.34928" cy="385.9895275000001" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="2.0034928" data-y="-0.46751595000000035" cx="300.34928" cy="386.0168525" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.4002733499999995" data-y="-0.30120930000000024" cx="240.027335" cy="369.3588625000001" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.4002733499999995" data-y="-0.30120930000000024" cx="240.027335" cy="369.3861875" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="0.7999316625000001" data-y="0.2" cx="179.99316625000006" cy="319.23793250000006" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="1.774217975" data-y="1.3002732499999994" cx="277.4217975" cy="209.23793250000003" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="3.3884680250000008" data-y="1.2997267500000007" cx="438.8468025000001" cy="209.2652575" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="0.6000000000000001" data-y="0.2" cx="160.00000000000003" cy="319.26525749999996" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="1.4002733499999995,-0.0012093000000001908 0.6000000000000001,0" data-type="line" data-label="" points="240.027335,339.3588625000001 160.00000000000003,339.23793250000006" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
+    <circle data-type="point" data-label="" data-x="3.6000000000000005" data-y="-0.9" cx="460.0000000000001" cy="429.26525749999996" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="1.3997266500000003,1.1012093000000003 2.1487092999999997,1.3002732499999994" data-type="line" data-label="" points="239.97266500000006,229.1170025 314.87093,209.21060750000012" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
+    <circle data-type="point" data-label="" data-x="3.2512907000000006" data-y="1.2997267500000007" cx="425.12907000000007" cy="209.2925824999999" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="2.1487092999999997,1.3002732499999994 0.6000000000000001,0.2" data-type="line" data-label="" points="314.87093,209.21060750000012 160.00000000000003,319.23793250000006" fill="none" stroke="hsl(280, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="1.4002733499999995,-0.0012093000000001908 0.6000000000000001,0" data-type="line" data-label="" points="240.027335,339.3861875 160.00000000000003,339.26525749999996" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.8000000000000003,0 3.2512907000000006,1.2997267500000007" data-type="line" data-label="" points="480,339.23793250000006 425.12907000000007,209.2652575" fill="none" stroke="hsl(336, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="1.3997266500000003,1.1012093000000003 2.1487092999999997,1.3002732499999994" data-type="line" data-label="" points="239.97266500000006,229.14432749999992 314.87093,209.23793250000003" fill="none" stroke="hsl(256, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.8000000000000003,-0.9 3.2512907000000006,1.2997267500000007" data-type="line" data-label="" points="480,429.23793250000006 425.12907000000007,209.2652575" fill="none" stroke="hsl(336, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="2.1487092999999997,1.3002732499999994 0.6000000000000001,0.2" data-type="line" data-label="" points="314.87093,209.23793250000003 160.00000000000003,319.26525749999996" fill="none" stroke="hsl(280, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.0034928,-0.8350319000000007 0.6000000000000001,-0.2" data-type="line" data-label="" points="300.34928,422.74112250000013 160.00000000000003,359.23793250000006" fill="none" stroke="hsl(352, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="3.8000000000000003,0 3.2512907000000006,1.2997267500000007" data-type="line" data-label="" points="480,339.26525749999996 425.12907000000007,209.2925824999999" fill="none" stroke="hsl(336, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.2512907000000006,1.2997267500000007 3.8000000000000003,0" data-type="line" data-label="" points="425.12907000000007,209.2652575 480,339.23793250000006" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="3.8000000000000003,-0.9 3.2512907000000006,1.2997267500000007" data-type="line" data-label="" points="480,429.26525749999996 425.12907000000007,209.2925824999999" fill="none" stroke="hsl(336, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.2512907000000006,1.2997267500000007 3.8000000000000003,-0.9" data-type="line" data-label="" points="425.12907000000007,209.2652575 480,429.23793250000006" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="2.0034928,-0.8350319000000007 0.6000000000000001,-0.2" data-type="line" data-label="" points="300.34928,422.76844750000004 160.00000000000003,359.26525749999996" fill="none" stroke="hsl(352, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.8000000000000003,0 3.8000000000000003,-0.9" data-type="line" data-label="" points="480,339.23793250000006 480,429.23793250000006" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="3.2512907000000006,1.2997267500000007 3.8000000000000003,0" data-type="line" data-label="" points="425.12907000000007,209.2925824999999 480,339.26525749999996" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="1.4002733499999995,-0.0012093000000001908 1.4002733499999995,-0.30120930000000024 1.0001366749999998,-0.30120930000000024 1.0001366749999998,0 0.6000000000000001,0" data-type="line" data-label="" points="240.027335,339.3588625000001 240.027335,369.3588625000001 200.0136675,369.3588625000001 200.0136675,339.23793250000006 160.00000000000003,339.23793250000006" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.2512907000000006,1.2997267500000007 3.8000000000000003,-0.9" data-type="line" data-label="" points="425.12907000000007,209.2925824999999 480,429.26525749999996" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="2.1487092999999997,1.3002732499999994 1.3997266500000003,1.3002732499999994 1.3997266500000003,1.1012093000000003" data-type="line" data-label="" points="314.87093,209.21060750000012 239.97266500000006,209.21060750000012 239.97266500000006,229.1170025" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.8000000000000003,0 3.8000000000000003,-0.9" data-type="line" data-label="" points="480,339.26525749999996 480,429.26525749999996" fill="none" stroke="hsl(123, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="0.6000000000000001,0.2 0.9998633250000002,0.2 0.9998633250000002,1.3012093000000002 1.3997266500000003,1.3012093000000002 1.3997266500000003,1.1012093000000003" data-type="line" data-label="" points="160.00000000000003,319.23793250000006 199.98633250000006,319.23793250000006 199.98633250000006,209.11700250000004 239.97266500000006,209.11700250000004 239.97266500000006,229.1170025" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.4002733499999995,-0.0012093000000001908 1.4002733499999995,-0.30120930000000024 1.0001366749999998,-0.30120930000000024 1.0001366749999998,0 0.6000000000000001,0" data-type="line" data-label="" points="240.027335,339.3861875 240.027335,369.3861875 200.0136675,369.3861875 200.0136675,339.26525749999996 160.00000000000003,339.26525749999996" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.8000000000000003,-0.9 3.6000000000000005,-0.9 3.6000000000000005,0 3.8000000000000003,0" data-type="line" data-label="" points="480,429.23793250000006 460.0000000000001,429.23793250000006 460.0000000000001,339.23793250000006 480,339.23793250000006" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="2.0034928,-0.8350319000000007 2.0034928,-0.1 0.7000000000000001,-0.1 0.7000000000000001,-0.2 0.6000000000000001,-0.2" data-type="line" data-label="" points="300.34928,422.76844750000004 300.34928,349.26525749999996 170.00000000000003,349.26525749999996 170.00000000000003,359.26525749999996 160.00000000000003,359.26525749999996" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="3.2512907000000006,1.2997267500000007 3.5256453500000005,1.2997267500000007 3.5256453500000005,0 3.8000000000000003,0" data-type="line" data-label="" points="425.12907000000007,209.2652575 452.5645350000001,209.2652575 452.5645350000001,339.23793250000006 480,339.23793250000006" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="2.1487092999999997,1.3002732499999994 1.3997266500000003,1.3002732499999994 1.3997266500000003,1.1012093000000003 1.3997266500000003,1.3012093000000002 0.9998633250000002,1.3012093000000002 0.9998633250000002,0.2 0.6000000000000001,0.2" data-type="line" data-label="" points="314.87093,209.23793250000003 239.97266500000006,209.23793250000003 239.97266500000006,229.14432749999992 239.97266500000006,209.14432749999995 199.98633250000006,209.14432749999995 199.98633250000006,319.26525749999996 160.00000000000003,319.26525749999996" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="2.0034928,-0.8350319000000007 2.0034928,-0.1 0.7000000000000001,-0.1 0.7000000000000001,-0.2 0.6000000000000001,-0.2" data-type="line" data-label="" points="300.34928,422.74112250000013 300.34928,349.23793250000006 170.00000000000003,349.23793250000006 170.00000000000003,359.23793250000006 160.00000000000003,359.23793250000006" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="3.8000000000000003,-0.9 3.6000000000000005,-0.9 3.6000000000000005,0 3.8000000000000003,0 3.5256453500000005,0 3.5256453500000005,1.2997267500000007 3.2512907000000006,1.2997267500000007" data-type="line" data-label="" points="480,429.26525749999996 460.0000000000001,429.26525749999996 460.0000000000001,339.26525749999996 480,339.26525749999996 452.5645350000001,339.26525749999996 452.5645350000001,209.2925824999999 425.12907000000007,209.2925824999999" 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="40.00000000000002" y="299.23793250000006" width="120" height="80" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="40.00000000000002" y="299.26525749999996" width="120" height="80" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="1.4" data-y="0.55" x="213.54167" y="229.1170025" width="52.916660000000036" height="110.24186000000009" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="1.4" data-y="0.55" x="213.54167" y="229.14432749999992" width="52.916660000000036" height="110.24186000000009" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_2" data-x="2.7" data-y="1.3" x="314.87093" y="189.7923975000001" width="110.25814000000008" height="38.8910699999999" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_2" data-x="2.7" data-y="1.3" x="314.87093" y="189.8197225" width="110.25814000000008" height="38.8910699999999" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_3" data-x="4.4" data-y="0" x="480" y="319.23793250000006" width="120" height="40" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_3" data-x="4.4" data-y="0" x="480" y="319.26525749999996" width="120" height="40" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_4" data-x="4.4" data-y="-0.9" x="480" y="409.23793250000006" width="120" height="40" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_4" data-x="4.4" data-y="-0.9" x="480" y="409.26525749999996" width="120" height="40" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_5" data-x="2" data-y="-1.1" x="255.41992000000002" y="422.74112250000013" width="89.16015999999999" height="52.99361999999991" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
+    <rect data-type="rect" data-label="schematic_component_5" data-x="2" data-y="-1.1" x="255.41992000000002" y="422.76844750000004" width="89.16015999999999" height="52.99361999999991" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: solderjumper.JP8 &gt; port.pin2 to .U1 &gt; .pin6
-globalConnNetId: connectivity_net3" data-x="2.2284928" data-y="-0.46751595000000035" x="300.34928" y="375.9895275000001" width="45" height="19.999999999999943" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+globalConnNetId: connectivity_net3" data-x="2.2284928" data-y="-0.46751595000000035" x="300.34928" y="376.0168525" width="45" height="19.999999999999943" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: capacitor.C2 &gt; port.pin1 to .U1 &gt; .pin8
-globalConnNetId: connectivity_net0" data-x="1.6252733499999996" data-y="-0.30120930000000024" x="240.027335" y="359.3588625000001" width="45" height="20" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+globalConnNetId: connectivity_net0" data-x="1.6252733499999996" data-y="-0.30120930000000024" x="240.027335" y="359.3861875" width="45" height="20" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: resistor.R1 &gt; port.pin1 to .U1 &gt; .pin1
-globalConnNetId: connectivity_net1" data-x="0.7999316625000001" data-y="0.42500000000000004" x="169.99316625000006" y="274.23793250000006" width="20" height="45" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+globalConnNetId: connectivity_net1" data-x="1.774217975" data-y="1.5252732499999995" x="267.4217975" y="164.2379325" width="20" height="45.00000000000003" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: resistor.R1 &gt; port.pin1 to .U1 &gt; .pin1
+globalConnNetId: connectivity_net1" data-x="0.8260000000000001" data-y="0.2" x="160.10000000000002" y="309.26525749999996" width="45.00000000000003" height="20" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: PAD
+globalConnNetId: connectivity_net2" data-x="3.6000000000000005" data-y="-1.125" x="450.0000000000001" y="429.26525749999996" width="20" height="45" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: PAD
-globalConnNetId: connectivity_net2" data-x="3.3884680250000008" data-y="1.5247267500000008" x="428.8468025000001" y="164.26525749999996" width="20" height="45.00000000000003" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
+globalConnNetId: connectivity_net2" data-x="3.4772907000000006" data-y="1.2997267500000007" x="425.2290700000001" y="199.2925824999999" width="45" height="20" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -176,7 +180,7 @@ globalConnNetId: connectivity_net2" data-x="3.3884680250000008" data-y="1.524726
         "e": 100.00000000000003,
         "b": 0,
         "d": -100,
-        "f": 339.23793250000006
+        "f": 339.26525749999996
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute:
diff --git a/tests/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.test.ts b/tests/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.test.ts
new file mode 100644
index 00000000..bf9ad219
--- /dev/null
+++ b/tests/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver.test.ts
@@ -0,0 +1,156 @@
+import { expect, test, describe } from "bun:test"
+import { SameNetTraceMergeSolver } from "lib/solvers/SameNetTraceMergeSolver/SameNetTraceMergeSolver"
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+
+function makeTrace(
+  id: string,
+  netId: string,
+  path: Array<{ x: number; y: number }>,
+): SolvedTracePath {
+  return {
+    mspPairId: id,
+    dcConnNetId: netId,
+    globalConnNetId: netId,
+    userNetId: undefined,
+    pins: [] as any,
+    tracePath: path,
+    mspConnectionPairIds: [id],
+    pinIds: [],
+  }
+}
+
+describe("SameNetTraceMergeSolver", () => {
+  test("merges two collinear same-net traces with touching endpoints", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 1, y: 0 },
+      { x: 2, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({ traces: [t1, t2] })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.solved).toBe(true)
+    expect(solver.outputTraces.length).toBe(1)
+    expect(solver.mergeCount).toBe(1)
+    expect(solver.outputTraces[0]!.tracePath).toEqual([
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+      { x: 2, y: 0 },
+    ])
+  })
+
+  test("merges traces with a small gap within maxEndpointGap", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 1.1, y: 0 },
+      { x: 2, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({
+      traces: [t1, t2],
+      maxEndpointGap: 0.15,
+    })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(1)
+  })
+
+  test("does NOT merge traces from different nets", () => {
+    const t1 = makeTrace("t1", "netA", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "netB", [
+      { x: 1, y: 0 },
+      { x: 2, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({ traces: [t1, t2] })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(2)
+    expect(solver.mergeCount).toBe(0)
+  })
+
+  test("does NOT merge when gap exceeds maxEndpointGap", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 2, y: 0 },
+      { x: 3, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({
+      traces: [t1, t2],
+      maxEndpointGap: 0.12,
+    })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(2)
+  })
+
+  test("inserts L-bridge when endpoints are not axis-aligned", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 1.05, y: 0.05 },
+      { x: 2, y: 0.05 },
+    ])
+    const solver = new SameNetTraceMergeSolver({
+      traces: [t1, t2],
+      maxEndpointGap: 0.15,
+    })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(1)
+    // Bridge point should exist between the two paths
+    const path = solver.outputTraces[0]!.tracePath
+    expect(path.length).toBeGreaterThan(3)
+  })
+
+  test("merges multiple traces in the same net iteratively", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 1, y: 0 },
+      { x: 2, y: 0 },
+    ])
+    const t3 = makeTrace("t3", "net1", [
+      { x: 2, y: 0 },
+      { x: 3, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({ traces: [t1, t2, t3] })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(1)
+    expect(solver.mergeCount).toBe(2)
+  })
+
+  test("leaves single-trace nets unchanged", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({ traces: [t1] })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(1)
+    expect(solver.mergeCount).toBe(0)
+  })
+
+  test("handles reversed endpoint matching (end-to-end)", () => {
+    const t1 = makeTrace("t1", "net1", [
+      { x: 0, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const t2 = makeTrace("t2", "net1", [
+      { x: 2, y: 0 },
+      { x: 1, y: 0 },
+    ])
+    const solver = new SameNetTraceMergeSolver({ traces: [t1, t2] })
+    while (!solver.solved && !solver.failed) solver.step()
+    expect(solver.outputTraces.length).toBe(1)
+  })
+})