From b3b857b42c6978b0d2a6c32066e3de7e830069ba Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 18 Jan 2023 22:04:13 +0100
Subject: Update schematic

---
 kicad-dart-70/baseband.kicad_sch | 1638 +++++++++++---------------------------
 1 file changed, 444 insertions(+), 1194 deletions(-)

(limited to 'kicad-dart-70/baseband.kicad_sch')

diff --git a/kicad-dart-70/baseband.kicad_sch b/kicad-dart-70/baseband.kicad_sch
index 7018863..191e1c1 100644
--- a/kicad-dart-70/baseband.kicad_sch
+++ b/kicad-dart-70/baseband.kicad_sch
@@ -1925,126 +1925,6 @@
         )
       )
     )
-    (symbol "Device:Transformer_1P_1S" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "T" (id 0) (at 0 6.35 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Transformer_1P_1S" (id 1) (at 0 -7.62 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "transformer coil magnet" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Transformer, single primary, single secondary" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Transformer_1P_1S_0_1"
-        (arc (start -2.54 -5.0546) (mid -1.6599 -4.6901) (end -1.27 -3.81)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -2.54 -2.5146) (mid -1.6599 -2.1501) (end -1.27 -1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -2.54 0.0254) (mid -1.6599 0.3899) (end -1.27 1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -2.54 2.5654) (mid -1.6599 2.9299) (end -1.27 3.81)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -1.27 -3.81) (mid -1.642 -2.912) (end -2.54 -2.54)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -1.27 -1.27) (mid -1.642 -0.372) (end -2.54 0)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -1.27 1.27) (mid -1.642 2.168) (end -2.54 2.54)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start -1.27 3.81) (mid -1.642 4.708) (end -2.54 5.08)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -0.635 5.08)
-            (xy -0.635 -5.08)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 -5.08)
-            (xy 0.635 5.08)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 1.2954 -1.27) (mid 1.6599 -2.1501) (end 2.54 -2.5146)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 1.2954 1.27) (mid 1.6599 0.3899) (end 2.54 0.0254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 1.2954 3.81) (mid 1.6599 2.9299) (end 2.54 2.5654)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 1.3208 -3.81) (mid 1.6853 -4.6901) (end 2.5654 -5.0546)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 2.54 0) (mid 1.642 -0.372) (end 1.2954 -1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 2.54 2.54) (mid 1.642 2.168) (end 1.2954 1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 2.54 5.08) (mid 1.642 4.708) (end 1.2954 3.81)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 2.5654 -2.54) (mid 1.6674 -2.912) (end 1.3208 -3.81)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "Transformer_1P_1S_1_1"
-        (pin passive line (at -10.16 5.08 0) (length 7.62)
-          (name "AA" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -10.16 -5.08 0) (length 7.62)
-          (name "AB" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 -5.08 180) (length 7.62)
-          (name "SA" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 5.08 180) (length 7.62)
-          (name "SB" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:Transformer_1P_SS" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "T" (id 0) (at 0 6.35 0)
         (effects (font (size 1.27 1.27)))
@@ -2230,278 +2110,6 @@
         )
       )
     )
-    (symbol "Relay:G6K-2" (in_bom yes) (on_board yes)
-      (property "Reference" "K" (id 0) (at 16.51 3.81 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Value" "G6K-2" (id 1) (at 16.51 1.27 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
-      )
-      (property "Datasheet" "http://omronfs.omron.com/en_US/ecb/products/pdf/en-g6k.pdf" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "Miniature Relay Dual Pole DPDT Omron" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Miniature 2-pole relay, Single-side Stable" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Relay*DPDT*Omron*G6K?2*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "G6K-2_0_0"
-        (text "+" (at -9.271 2.921 0)
-          (effects (font (size 1.27 1.27)))
-        )
-      )
-      (symbol "G6K-2_0_1"
-        (rectangle (start -15.24 5.08) (end 15.24 -5.08)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (rectangle (start -13.335 1.905) (end -6.985 -1.905)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -12.7 -1.905)
-            (xy -7.62 1.905)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -10.16 -5.08)
-            (xy -10.16 -1.905)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -10.16 5.08)
-            (xy -10.16 1.905)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.985 0)
-            (xy -6.35 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -5.715 0)
-            (xy -5.08 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -4.445 0)
-            (xy -3.81 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -3.175 0)
-            (xy -2.54 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.905 0)
-            (xy -1.27 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -0.635 0)
-            (xy 0 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 -2.54)
-            (xy -1.905 3.81)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 -2.54)
-            (xy 0 -5.08)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 0)
-            (xy 1.27 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.905 0)
-            (xy 2.54 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.175 0)
-            (xy 3.81 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 4.445 0)
-            (xy 5.08 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 5.715 0)
-            (xy 6.35 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 6.985 0)
-            (xy 7.62 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 8.255 0)
-            (xy 8.89 0)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.16 -2.54)
-            (xy 8.255 3.81)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.16 -2.54)
-            (xy 10.16 -5.08)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -2.54 5.08)
-            (xy -2.54 2.54)
-            (xy -1.905 3.175)
-            (xy -2.54 3.81)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 2.54 5.08)
-            (xy 2.54 2.54)
-            (xy 1.905 3.175)
-            (xy 2.54 3.81)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 7.62 5.08)
-            (xy 7.62 2.54)
-            (xy 8.255 3.175)
-            (xy 7.62 3.81)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 12.7 5.08)
-            (xy 12.7 2.54)
-            (xy 12.065 3.175)
-            (xy 12.7 3.81)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "G6K-2_1_1"
-        (pin passive line (at -10.16 7.62 270) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -2.54 7.62 270) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -7.62 90) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 7.62 270) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 12.7 7.62 270) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 10.16 -7.62 90) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 7.62 270) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -10.16 -7.62 90) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Transistor_BJT:BC856" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -2582,86 +2190,6 @@
         )
       )
     )
-    (symbol "Transistor_BJT:BC856W" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Value" "BC856W" (id 1) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70" (id 2) (at 5.08 -1.905 0)
-        (effects (font (size 1.27 1.27) italic) (justify left) hide)
-      )
-      (property "Datasheet" "https://www.onsemi.com/pub/Collateral/BC860-D.pdf" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left) hide)
-      )
-      (property "ki_keywords" "PNP transistor" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "0.1A Ic, 65V Vce, PNP Transistor, SOT-323" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?323*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "BC856W_0_1"
-        (polyline
-          (pts
-            (xy 0.635 0.635)
-            (xy 2.54 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 -0.635)
-            (xy 2.54 -2.54)
-            (xy 2.54 -2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 1.905)
-            (xy 0.635 -1.905)
-            (xy 0.635 -1.905)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.286 -1.778)
-            (xy 1.778 -2.286)
-            (xy 1.27 -1.27)
-            (xy 2.286 -1.778)
-            (xy 2.286 -1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (circle (center 1.27 0) (radius 2.8194)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "BC856W_1_1"
-        (pin input line (at -5.08 0 0) (length 5.715)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 -5.08 90) (length 2.54)
-          (name "E" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Transistor_BJT:MMBT3904" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -3276,63 +2804,11 @@
         )
       )
     )
-    (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "+3.3V_0_1"
-        (polyline
-          (pts
-            (xy -0.762 1.27)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 0)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 2.54)
-            (xy 0.762 1.27)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "+3.3V_1_1"
-        (pin power_in line (at 0 0 90) (length 0) hide
-          (name "+3V3" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
+    (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "GND" (id 1) (at 0 -3.81 0)
+      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -3344,26 +2820,38 @@
       (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "GND_0_1"
+      (symbol "+3.3V_0_1"
+        (polyline
+          (pts
+            (xy -0.762 1.27)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (polyline
           (pts
             (xy 0 0)
-            (xy 0 -1.27)
-            (xy 1.27 -1.27)
-            (xy 0 -2.54)
-            (xy -1.27 -1.27)
-            (xy 0 -1.27)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy 0.762 1.27)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
-      (symbol "GND_1_1"
-        (pin power_in line (at 0 0 270) (length 0) hide
-          (name "GND" (effects (font (size 1.27 1.27))))
+      (symbol "+3.3V_1_1"
+        (pin power_in line (at 0 0 90) (length 0) hide
+          (name "+3V3" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
       )
@@ -3428,7 +2916,7 @@
   (junction (at 265.43 172.72) (diameter 0) (color 0 0 0 0)
     (uuid 06536fe5-804c-49ea-be1f-f17d61e41354)
   )
-  (junction (at 71.12 236.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 71.12 259.08) (diameter 0) (color 0 0 0 0)
     (uuid 08e3fbcd-b24c-43b5-a2a5-3ed606084464)
   )
   (junction (at 389.89 212.09) (diameter 0) (color 0 0 0 0)
@@ -3437,7 +2925,7 @@
   (junction (at 139.7 166.37) (diameter 0) (color 0 0 0 0)
     (uuid 0a639b6c-6bcd-49c1-9a6e-7344d47860d2)
   )
-  (junction (at 134.62 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 278.13) (diameter 0) (color 0 0 0 0)
     (uuid 0e565d2a-00bb-4f20-8e2e-0f824e8d2762)
   )
   (junction (at 102.87 38.1) (diameter 0) (color 0 0 0 0)
@@ -3464,9 +2952,6 @@
   (junction (at 68.58 123.19) (diameter 0) (color 0 0 0 0)
     (uuid 1a40de25-0d4b-4ee8-8390-eda2db6a3d47)
   )
-  (junction (at -66.04 114.3) (diameter 0) (color 0 0 0 0)
-    (uuid 1aaf34a3-282e-4633-82fa-9d6cdf32efbb)
-  )
   (junction (at 83.82 115.57) (diameter 0) (color 0 0 0 0)
     (uuid 1bbdfeb9-0e22-43ad-a9eb-15915db8f44f)
   )
@@ -3482,10 +2967,7 @@
   (junction (at 68.58 138.43) (diameter 0) (color 0 0 0 0)
     (uuid 1df28245-4758-4aa6-85a4-669f880421f4)
   )
-  (junction (at 140.97 48.26) (diameter 0) (color 0 0 0 0)
-    (uuid 201d7aae-9fa3-44a6-80ec-1dc27857b95f)
-  )
-  (junction (at 105.41 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 105.41 278.13) (diameter 0) (color 0 0 0 0)
     (uuid 210630ed-a720-499f-8ec9-3630627e1e05)
   )
   (junction (at 149.86 170.18) (diameter 0) (color 0 0 0 0)
@@ -3494,7 +2976,7 @@
   (junction (at 44.45 68.58) (diameter 0) (color 0 0 0 0)
     (uuid 22f086a0-4e36-4832-8e1e-3bdb65f5c3f2)
   )
-  (junction (at 83.82 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 83.82 278.13) (diameter 0) (color 0 0 0 0)
     (uuid 24fd922c-d488-4d61-b6dc-9d3e359ccc82)
   )
   (junction (at 43.18 36.83) (diameter 0) (color 0 0 0 0)
@@ -3506,7 +2988,7 @@
   (junction (at 83.82 128.27) (diameter 0) (color 0 0 0 0)
     (uuid 27eaad48-6f2d-40af-b26c-f1f52c055ea8)
   )
-  (junction (at 289.56 73.66) (diameter 0) (color 0 0 0 0)
+  (junction (at 281.94 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 29679519-0074-4244-8bb1-857f21221a1a)
   )
   (junction (at 106.68 -27.94) (diameter 0) (color 0 0 0 0)
@@ -3518,7 +3000,7 @@
   (junction (at 72.39 46.99) (diameter 0) (color 0 0 0 0)
     (uuid 2d264e2f-7e31-4a17-86c5-13a68ab3ff7e)
   )
-  (junction (at 325.12 62.23) (diameter 0) (color 0 0 0 0)
+  (junction (at 317.5 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 2ee50ef4-e14b-4cdd-b277-09dbc703d671)
   )
   (junction (at 300.99 100.33) (diameter 0) (color 0 0 0 0)
@@ -3536,7 +3018,7 @@
   (junction (at 194.31 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 3bf0f30a-4c02-4011-9e56-5268cd9a18bc)
   )
-  (junction (at 279.4 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 271.78 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 3c3ec9ea-2f3e-4d19-9e10-895079fd0f3f)
   )
   (junction (at 146.05 20.32) (diameter 0) (color 0 0 0 0)
@@ -3545,19 +3027,19 @@
   (junction (at 318.77 167.64) (diameter 0) (color 0 0 0 0)
     (uuid 3fae85f6-374f-4472-8821-81e935dc5df4)
   )
-  (junction (at 318.77 60.96) (diameter 0) (color 0 0 0 0)
+  (junction (at 311.15 46.99) (diameter 0) (color 0 0 0 0)
     (uuid 414842e2-7a02-457e-9971-ff5bded25512)
   )
   (junction (at 170.18 200.66) (diameter 0) (color 0 0 0 0)
     (uuid 43c88063-044a-47b7-b010-f3fb76152eec)
   )
-  (junction (at 71.12 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 71.12 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 460147d8-e4b6-4910-88e9-07d1ddd6c2df)
   )
   (junction (at 76.2 138.43) (diameter 0) (color 0 0 0 0)
     (uuid 49cc8c43-5c55-4202-ae4f-37f234578cb7)
   )
-  (junction (at 83.82 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 83.82 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 4b982f8b-ca29-4ebf-88fc-8a50b24e0802)
   )
   (junction (at 196.85 124.46) (diameter 0) (color 0 0 0 0)
@@ -3575,13 +3057,13 @@
   (junction (at 189.23 146.05) (diameter 0) (color 0 0 0 0)
     (uuid 5a351350-3bae-4444-b037-df6bea15164c)
   )
-  (junction (at -55.88 106.68) (diameter 0) (color 0 0 0 0)
-    (uuid 5b29962f-685a-409c-915c-9c4a92ed442a)
-  )
-  (junction (at 147.32 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 147.32 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 5c4341e3-29f4-4014-ad6b-9b4cb50156a6)
   )
-  (junction (at 134.62 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 118.11 232.41) (diameter 0) (color 0 0 0 0)
+    (uuid 5d58706a-c013-405c-9112-847886006796)
+  )
+  (junction (at 134.62 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 5dbda758-e74b-4ccf-ad68-495d537d68ba)
   )
   (junction (at 55.88 129.54) (diameter 0) (color 0 0 0 0)
@@ -3590,13 +3072,13 @@
   (junction (at 152.4 -16.51) (diameter 0) (color 0 0 0 0)
     (uuid 5ed637ac-40ac-434c-a406-609e25d3658d)
   )
-  (junction (at 147.32 236.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 147.32 259.08) (diameter 0) (color 0 0 0 0)
     (uuid 5fc44bfc-3a32-42f5-89ff-303d655beeb1)
   )
   (junction (at 146.05 72.39) (diameter 0) (color 0 0 0 0)
     (uuid 611c0051-64b3-4ff6-b51a-6ea814324060)
   )
-  (junction (at 325.12 71.12) (diameter 0) (color 0 0 0 0)
+  (junction (at 317.5 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 62cd3edc-a5f4-4820-bbe7-c3279ef20997)
   )
   (junction (at 384.81 93.98) (diameter 0) (color 0 0 0 0)
@@ -3605,9 +3087,6 @@
   (junction (at 243.84 195.58) (diameter 0) (color 0 0 0 0)
     (uuid 666e4a05-1237-4554-b21f-427292bd8e37)
   )
-  (junction (at -55.88 119.38) (diameter 0) (color 0 0 0 0)
-    (uuid 669e2f76-dce7-4b88-b383-d3587e6cc0cc)
-  )
   (junction (at 375.92 194.31) (diameter 0) (color 0 0 0 0)
     (uuid 707b1436-6255-4e74-ac3c-e365f258d4c7)
   )
@@ -3647,15 +3126,9 @@
   (junction (at 83.82 138.43) (diameter 0) (color 0 0 0 0)
     (uuid 8b0bcfdc-3f55-4e36-b156-0996ed2b4911)
   )
-  (junction (at 114.3 38.1) (diameter 0) (color 0 0 0 0)
-    (uuid 8bf6b6d5-4642-4712-b597-69648f02979f)
-  )
   (junction (at 387.35 222.25) (diameter 0) (color 0 0 0 0)
     (uuid 8d612602-5cc8-45dd-a943-2a29be4b9ede)
   )
-  (junction (at 138.43 53.34) (diameter 0) (color 0 0 0 0)
-    (uuid 8e130204-3aa9-4b37-8e36-da7865904fa3)
-  )
   (junction (at 337.82 203.2) (diameter 0) (color 0 0 0 0)
     (uuid 8f57152a-781e-4e8e-b36c-e81f9a864e3b)
   )
@@ -3668,7 +3141,7 @@
   (junction (at 33.02 63.5) (diameter 0) (color 0 0 0 0)
     (uuid 9134413a-edf3-40ce-9ec2-93a536746842)
   )
-  (junction (at 332.74 62.23) (diameter 0) (color 0 0 0 0)
+  (junction (at 325.12 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 92648d78-a89e-450a-9d5a-f375414e510f)
   )
   (junction (at 102.87 123.19) (diameter 0) (color 0 0 0 0)
@@ -3677,7 +3150,7 @@
   (junction (at 138.43 38.1) (diameter 0) (color 0 0 0 0)
     (uuid 94a7e072-a853-4895-a974-0e863ac9edc2)
   )
-  (junction (at 96.52 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 96.52 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 9666bb6a-0c1d-4c92-be6d-94a465ec5c51)
   )
   (junction (at 389.89 224.79) (diameter 0) (color 0 0 0 0)
@@ -3704,6 +3177,9 @@
   (junction (at 218.44 44.45) (diameter 0) (color 0 0 0 0)
     (uuid a8675aa5-24f4-4a65-9564-259800e24a61)
   )
+  (junction (at 100.33 232.41) (diameter 0) (color 0 0 0 0)
+    (uuid aa537d78-628c-458e-8a08-c2dae82aca82)
+  )
   (junction (at 185.42 200.66) (diameter 0) (color 0 0 0 0)
     (uuid ab5a5163-9113-4726-bc7a-7e25f5bcb137)
   )
@@ -3713,10 +3189,10 @@
   (junction (at 295.91 106.68) (diameter 0) (color 0 0 0 0)
     (uuid ad2d033c-4040-4813-b5da-82cf827f9d86)
   )
-  (junction (at 109.22 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.22 267.97) (diameter 0) (color 0 0 0 0)
     (uuid ad485fa9-ca4c-467a-b6d9-302ae2ec4eaa)
   )
-  (junction (at 109.22 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.22 278.13) (diameter 0) (color 0 0 0 0)
     (uuid aed41e50-066a-4d5d-9b35-33c86a58f817)
   )
   (junction (at 161.29 144.78) (diameter 0) (color 0 0 0 0)
@@ -3770,19 +3246,16 @@
   (junction (at 351.79 187.96) (diameter 0) (color 0 0 0 0)
     (uuid c07980be-125c-4459-be81-f2b8371f5ae2)
   )
-  (junction (at -59.69 134.62) (diameter 0) (color 0 0 0 0)
-    (uuid c26d7e1d-0511-44b3-9911-466a7132a529)
-  )
   (junction (at 138.43 41.91) (diameter 0) (color 0 0 0 0)
     (uuid c41a688f-80a3-4252-bb37-134631846db3)
   )
   (junction (at 176.53 139.7) (diameter 0) (color 0 0 0 0)
     (uuid c56d43d7-d576-4bc7-8ab7-d28306d83cba)
   )
-  (junction (at 121.92 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 121.92 278.13) (diameter 0) (color 0 0 0 0)
     (uuid c8816f2b-d043-4f02-8988-815e5e7435ee)
   )
-  (junction (at 121.92 245.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 121.92 267.97) (diameter 0) (color 0 0 0 0)
     (uuid ca2ddb3d-eff7-4148-ac57-d5c14ba8be31)
   )
   (junction (at 17.78 93.98) (diameter 0) (color 0 0 0 0)
@@ -3797,7 +3270,7 @@
   (junction (at 33.02 81.28) (diameter 0) (color 0 0 0 0)
     (uuid cfa6195a-5066-4377-9f73-1328281e7e8b)
   )
-  (junction (at 96.52 255.27) (diameter 0) (color 0 0 0 0)
+  (junction (at 96.52 278.13) (diameter 0) (color 0 0 0 0)
     (uuid d3e01bdf-5c14-407f-80a1-1d934fc04fab)
   )
   (junction (at 194.31 185.42) (diameter 0) (color 0 0 0 0)
@@ -3827,9 +3300,6 @@
   (junction (at 131.445 20.32) (diameter 0) (color 0 0 0 0)
     (uuid ddaaa428-40ee-45ee-a789-6961e25a11bb)
   )
-  (junction (at 113.03 48.26) (diameter 0) (color 0 0 0 0)
-    (uuid de406bef-5463-4ca6-973a-507e0875b3c1)
-  )
   (junction (at 53.34 85.09) (diameter 0) (color 0 0 0 0)
     (uuid df231e82-dc0c-49c1-a01b-d2be84591ff3)
   )
@@ -3854,7 +3324,7 @@
   (junction (at 218.44 36.83) (diameter 0) (color 0 0 0 0)
     (uuid ecba702e-9fb5-4bd7-9b08-5197492ec54b)
   )
-  (junction (at 271.78 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 264.16 66.04) (diameter 0) (color 0 0 0 0)
     (uuid f056ea50-55b1-41e7-b494-b5d2ecc55c1b)
   )
   (junction (at 358.14 129.54) (diameter 0) (color 0 0 0 0)
@@ -3863,13 +3333,13 @@
   (junction (at 200.66 20.32) (diameter 0) (color 0 0 0 0)
     (uuid f1a9e2a2-6347-4852-b335-cf8402c433a4)
   )
-  (junction (at 318.77 71.12) (diameter 0) (color 0 0 0 0)
+  (junction (at 311.15 57.15) (diameter 0) (color 0 0 0 0)
     (uuid f3285ed9-855d-4b3c-9145-ed9dbda7a1d9)
   )
   (junction (at 176.53 124.46) (diameter 0) (color 0 0 0 0)
     (uuid f48610b4-7716-4660-a4c1-c570d7241e98)
   )
-  (junction (at 289.56 58.42) (diameter 0) (color 0 0 0 0)
+  (junction (at 281.94 44.45) (diameter 0) (color 0 0 0 0)
     (uuid f9728ce1-58db-4b51-bb92-9b665142c745)
   )
   (junction (at 160.02 34.29) (diameter 0) (color 0 0 0 0)
@@ -3892,7 +3362,11 @@
   )
 
   (no_connect (at 107.95 231.14) (uuid 2b99a1e6-5f67-436f-9ed5-38e8bfd4c142))
-  (no_connect (at 115.57 58.42) (uuid d5f2569f-277a-4857-bf67-a25e81fd5311))
+  (no_connect (at 80.01 238.76) (uuid 382f6523-39c3-438d-a8ea-2e19bf34dd0b))
+  (no_connect (at 138.43 238.76) (uuid 6233d005-eb70-4c19-96e7-6812a42d8ac4))
+  (no_connect (at 80.01 248.92) (uuid 6b3a4c26-900d-494c-ad91-86b75f9a6237))
+  (no_connect (at 115.57 43.18) (uuid afdb3662-3196-4d9d-b0e8-7f416bb5cd4f))
+  (no_connect (at 138.43 248.92) (uuid e98f509c-3ea1-4963-8ff6-1a9fffffbcb3))
   (no_connect (at 110.49 231.14) (uuid ee08a6c2-528a-478b-9089-08fe9a37ec7e))
 
   (wire (pts (xy 138.43 20.32) (xy 138.43 25.4))
@@ -3927,7 +3401,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 03dd13e2-d89f-47ed-8a2f-ce75e7a97ef3)
   )
-  (wire (pts (xy 134.62 245.11) (xy 138.43 245.11))
+  (wire (pts (xy 134.62 267.97) (xy 138.43 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 042fe62b-53aa-4e86-97d0-9ccb1e16a895)
   )
@@ -3943,7 +3417,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0734ff63-3ff1-4961-8ab2-1fd864a1b83d)
   )
-  (wire (pts (xy 80.01 236.22) (xy 83.82 236.22))
+  (wire (pts (xy 80.01 259.08) (xy 83.82 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 082d865b-0a4e-49c3-b18b-be47fd4a465a)
   )
@@ -3975,10 +3449,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0dc79dd3-c584-4173-b914-e6a8bcd18e45)
   )
-  (wire (pts (xy -55.88 106.68) (xy -66.04 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0de7d0e7-c8d5-482b-8e8a-d56acfc6ebd8)
-  )
   (wire (pts (xy 351.79 104.14) (xy 351.79 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0e1c6bbc-4cc4-4ce9-b48a-8292bb286da8)
@@ -3987,26 +3457,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0ef33a4f-7d4b-4740-be50-b4eb0bca14f1)
   )
+  (wire (pts (xy 118.11 232.41) (xy 118.11 231.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0f4b5c7f-79aa-4c46-b222-58e7e288b195)
+  )
   (wire (pts (xy 295.91 104.14) (xy 295.91 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 100847e3-630c-4c13-ba45-180e92370805)
   )
-  (wire (pts (xy 271.78 66.04) (xy 271.78 80.01))
+  (wire (pts (xy 264.16 52.07) (xy 264.16 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 10bd27b2-1d07-444a-9776-fc259e0db345)
   )
-  (wire (pts (xy -68.58 114.3) (xy -66.04 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 119c633c-175b-4b38-bbc1-1a076032c16e)
-  )
   (wire (pts (xy 177.8 200.66) (xy 171.45 200.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11ac1ac8-72b6-43ed-915e-50f87561daf8)
   )
-  (wire (pts (xy -59.69 134.62) (xy -59.69 130.81))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 127b0e8c-8b10-4db4-b691-908ac98caaf1)
-  )
   (wire (pts (xy 337.82 201.93) (xy 337.82 203.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15e1025c-faeb-49ff-aaa3-6ba9acaabd98)
@@ -4051,7 +3517,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1bc5b33c-8495-490e-9374-d1f85e319858)
   )
-  (wire (pts (xy 134.62 255.27) (xy 147.32 255.27))
+  (wire (pts (xy 134.62 278.13) (xy 147.32 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d8cbdb8-b0d5-4f06-84c8-05770b7e9555)
   )
@@ -4075,11 +3541,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1f719a87-1f83-4b82-896e-eb44e9afc694)
   )
-  (wire (pts (xy 83.82 236.22) (xy 83.82 245.11))
+  (wire (pts (xy 83.82 259.08) (xy 83.82 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1fd73780-e017-4e2c-9674-56cb6f09dc2d)
   )
-  (wire (pts (xy 115.57 233.68) (xy 147.32 233.68))
+  (wire (pts (xy 118.11 251.46) (xy 147.32 251.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2163a967-be2d-4344-a94d-f1b8da3dc3a3)
   )
@@ -4091,10 +3557,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 21ab1c66-7b64-491c-91e9-58d6530a3a75)
   )
-  (wire (pts (xy -52.07 134.62) (xy -59.69 134.62))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 21c9358c-c2dd-4df5-9cfe-ea9bd0b49374)
-  )
   (wire (pts (xy 384.81 104.14) (xy 384.81 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 22591446-6d82-47ac-b525-9e9deb496c8c)
@@ -4107,7 +3569,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 231e5ae4-1791-4485-9a32-a64456488009)
   )
-  (wire (pts (xy 298.45 71.12) (xy 298.45 73.66))
+  (wire (pts (xy 290.83 57.15) (xy 290.83 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 24e4c8b7-7963-4a14-b3e0-4b86218811d3)
   )
@@ -4127,7 +3589,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25b40549-5004-4a9f-8c83-45a4561f2c44)
   )
-  (wire (pts (xy 269.24 66.04) (xy 271.78 66.04))
+  (wire (pts (xy 261.62 52.07) (xy 264.16 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 261eb6dc-d5dd-4e47-8bce-04c77069621a)
   )
@@ -4167,15 +3629,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2b95ba84-89c5-4087-8627-4193621a6b38)
   )
-  (wire (pts (xy 138.43 236.22) (xy 134.62 236.22))
+  (wire (pts (xy 138.43 259.08) (xy 134.62 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ba6a5e2-be81-4fda-a558-a7c1489b8584)
   )
-  (wire (pts (xy 147.32 250.19) (xy 147.32 245.11))
+  (wire (pts (xy 147.32 273.05) (xy 147.32 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e6b1f7e-e4c3-43a1-ae90-c85aa40696d5)
   )
-  (wire (pts (xy 130.81 245.11) (xy 134.62 245.11))
+  (wire (pts (xy 130.81 267.97) (xy 134.62 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ec9be40-1d5a-4e2d-8a4d-4be2d3c079d5)
   )
@@ -4191,11 +3653,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2fe69b18-d697-473e-86f6-288c8afe39fa)
   )
-  (wire (pts (xy -59.69 123.19) (xy -59.69 119.38))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3019c847-3ccf-490a-9dd6-694227c3fba5)
-  )
-  (wire (pts (xy 289.56 58.42) (xy 298.45 58.42))
+  (wire (pts (xy 281.94 44.45) (xy 290.83 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 306c58e8-628e-47f3-98f7-56966b54150f)
   )
@@ -4239,10 +3697,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 33b6dbe8-d555-4f35-a63c-27c75fa09ca7)
   )
-  (wire (pts (xy -29.21 116.84) (xy -29.21 119.38))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 33e40dd5-556d-4de0-ab08-235c61b7ba9f)
-  )
   (wire (pts (xy 83.82 128.27) (xy 83.82 130.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 340b7fe7-4f71-4fb5-8d3e-955b9a4ee03d)
@@ -4255,7 +3709,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 34f82a5c-46ef-4bc6-8bbb-3bb5c2b36501)
   )
-  (wire (pts (xy 83.82 250.19) (xy 83.82 245.11))
+  (wire (pts (xy 83.82 273.05) (xy 83.82 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 35343f32-90ff-4059-a108-111fb444c3d2)
   )
@@ -4271,10 +3725,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 364f7692-8fd2-4996-8f00-fec21fff2827)
   )
-  (wire (pts (xy 147.32 245.11) (xy 143.51 245.11))
+  (wire (pts (xy 147.32 267.97) (xy 143.51 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 36696ac6-2db1-4b52-ae3d-9f3c89d2042f)
   )
+  (wire (pts (xy 118.11 243.84) (xy 115.57 243.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 375d04a8-729d-413e-9e4b-c6d3e964ed5f)
+  )
   (wire (pts (xy 168.91 154.305) (xy 175.26 154.305))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 386f204e-f24d-4550-85b9-7f13999cb818)
@@ -4292,11 +3750,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 393131ec-a9a2-4b13-8fa7-5bb85d9e7338)
   )
-  (wire (pts (xy 71.12 233.68) (xy 71.12 236.22))
+  (wire (pts (xy 71.12 251.46) (xy 71.12 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a274653-eff3-4ffe-9be8-2bfd0950af0a)
   )
-  (wire (pts (xy 109.22 245.11) (xy 113.03 245.11))
+  (wire (pts (xy 109.22 267.97) (xy 113.03 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3c11bba2-1b60-442e-87b9-29fc89c74881)
   )
@@ -4344,10 +3802,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 421e1cc2-36a4-4dea-b009-97c228e970dc)
   )
-  (wire (pts (xy -52.07 119.38) (xy -55.88 119.38))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4266f6dc-b108-467a-bc4a-756158b1a271)
-  )
   (wire (pts (xy 72.39 46.99) (xy 72.39 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 426d408a-ed40-43b4-b8c5-0e2c5087c1f6)
@@ -4381,11 +3835,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 454e30d7-bcaa-4ad9-9d06-8047eb4476bc)
   )
-  (wire (pts (xy 241.3 71.12) (xy 241.3 83.82))
+  (wire (pts (xy 241.3 57.15) (xy 241.3 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 45a5cf74-632b-46ee-90d4-1d268831c5aa)
   )
-  (wire (pts (xy 121.92 250.19) (xy 121.92 245.11))
+  (wire (pts (xy 121.92 273.05) (xy 121.92 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 462f8e7e-09c6-4676-ba4f-fd07b2868aa8)
   )
@@ -4397,16 +3851,16 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 46aac001-1e0b-4992-9b6b-7fbd6860af0e)
   )
-  (wire (pts (xy 279.4 73.66) (xy 289.56 73.66))
+  (wire (pts (xy 271.78 59.69) (xy 281.94 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4797a9a5-a5db-453d-be34-c58f5e708967)
   )
-  (polyline (pts (xy 156.21 224.79) (xy 156.21 261.62))
+  (polyline (pts (xy 156.21 224.79) (xy 156.21 284.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 47e3424a-459d-4696-b1ce-e9ec51099a1c)
   )
 
-  (wire (pts (xy 147.32 233.68) (xy 147.32 236.22))
+  (wire (pts (xy 147.32 251.46) (xy 147.32 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 47e8fba7-36e4-45b9-a8af-75005a86d254)
   )
@@ -4434,7 +3888,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d49a0aa-f132-4d9a-8008-eb3731d0492a)
   )
-  (wire (pts (xy 143.51 236.22) (xy 147.32 236.22))
+  (wire (pts (xy 143.51 259.08) (xy 147.32 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e43689e-9cf0-4146-b69d-54896ee090d3)
   )
@@ -4474,14 +3928,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5280889a-3188-46df-a619-4549a703abe3)
   )
-  (wire (pts (xy 279.4 58.42) (xy 289.56 58.42))
+  (wire (pts (xy 271.78 44.45) (xy 281.94 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 535b425e-2ead-4101-8ded-6dd7d2c9d352)
   )
-  (wire (pts (xy 118.11 231.14) (xy 119.38 231.14))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5367530c-ed81-476b-a95e-87df35f5556c)
-  )
   (wire (pts (xy 138.43 20.32) (xy 146.05 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53a7277a-bd72-4503-81ee-dc81381da923)
@@ -4510,7 +3960,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 56bbedad-6259-4443-b321-0ffa1f89c336)
   )
-  (wire (pts (xy 269.24 60.96) (xy 269.24 55.88))
+  (wire (pts (xy 261.62 46.99) (xy 261.62 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 57017bb9-5d41-4b31-9172-29f647f38db6)
   )
@@ -4518,14 +3968,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 57d8c5b0-8b80-4198-a2ed-4fdaeb3a4ec2)
   )
-  (wire (pts (xy 83.82 255.27) (xy 96.52 255.27))
+  (wire (pts (xy 83.82 278.13) (xy 96.52 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 59ee13a4-660e-47e2-a73a-01cfe11439e9)
   )
-  (wire (pts (xy 138.43 41.91) (xy 138.43 53.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5a66904e-2fd7-4ea9-aad4-2630cfb8f32d)
-  )
   (wire (pts (xy 80.01 36.83) (xy 80.01 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5a8feb70-4d5b-4e2c-8d26-ac865b90757b)
@@ -4619,7 +4065,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 66c9ab10-e515-4cff-9984-1d125b1275ae)
   )
-  (wire (pts (xy 71.12 236.22) (xy 74.93 236.22))
+  (wire (pts (xy 71.12 259.08) (xy 74.93 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 66e71cd4-32e2-436f-a2c7-cec951b87904)
   )
@@ -4635,7 +4081,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6816c017-2ccb-479e-9f22-54b316f5230c)
   )
-  (wire (pts (xy 102.87 48.26) (xy 113.03 48.26))
+  (wire (pts (xy 102.87 48.26) (xy 115.57 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68bb7527-cf5e-4d93-95d9-e93c273fb386)
   )
@@ -4651,19 +4097,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a3aff19-5e5c-466c-80b5-82ab994aaee1)
   )
-  (wire (pts (xy 294.64 66.04) (xy 294.64 55.88))
+  (wire (pts (xy 287.02 52.07) (xy 287.02 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c86afcb-7177-47f2-8064-ed3be1ff755e)
   )
-  (wire (pts (xy 135.89 63.5) (xy 140.97 63.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c9325a1-840c-486a-8f63-2948d1e04f5f)
-  )
   (wire (pts (xy 146.05 20.32) (xy 160.02 20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6cdd50bd-1188-4620-8e4f-368a173ab413)
   )
-  (wire (pts (xy 325.12 62.23) (xy 325.12 63.5))
+  (wire (pts (xy 317.5 48.26) (xy 317.5 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6cf52d79-87b9-4128-8ffe-954ceab1c3dc)
   )
@@ -4679,7 +4121,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6d53261f-b0db-4380-8d8d-078f89f10106)
   )
-  (wire (pts (xy 102.87 233.68) (xy 102.87 231.14))
+  (wire (pts (xy 100.33 248.92) (xy 100.33 251.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6de42070-f906-4f60-b26b-662ced81e4ea)
   )
@@ -4687,7 +4129,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6e416a78-df14-48ee-9842-e6e24081191e)
   )
-  (wire (pts (xy 96.52 250.19) (xy 96.52 245.11))
+  (wire (pts (xy 96.52 273.05) (xy 96.52 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6e77d4d6-0239-4c20-98f8-23ae4f71d638)
   )
@@ -4732,7 +4174,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 73aabf25-a95e-4350-87a7-328a1cdf5d36)
   )
-  (wire (pts (xy 298.45 58.42) (xy 298.45 60.96))
+  (wire (pts (xy 290.83 44.45) (xy 290.83 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 73b2d4b4-d67b-4a9a-a863-3e4af4b8fd5f)
   )
@@ -4748,10 +4190,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 74d2d2c1-d0d5-412f-ab06-bb67df0a3900)
   )
-  (wire (pts (xy 113.03 63.5) (xy 113.03 48.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 764a5883-850b-40d9-8eea-08749cbcb2ae)
-  )
   (wire (pts (xy 326.39 237.49) (xy 340.36 237.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 76b488fa-e9f2-40f3-aa68-df8ee6acd181)
@@ -4760,12 +4198,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 771cb5c1-62ba-4cca-999e-cdcbe417213c)
   )
-  (polyline (pts (xy 59.69 224.79) (xy 59.69 261.62))
+  (polyline (pts (xy 59.69 224.79) (xy 59.69 284.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 77f63278-dd6a-44ad-be59-60e72c5a32f1)
   )
 
-  (wire (pts (xy 140.97 48.26) (xy 167.64 48.26))
+  (wire (pts (xy 135.89 48.26) (xy 167.64 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78e23870-9b05-480d-b825-f65c8269c89f)
   )
@@ -4773,10 +4211,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78fe6eb8-dca7-4226-852e-a2bfdac2f5c0)
   )
-  (wire (pts (xy 115.57 38.1) (xy 114.3 38.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 794f35f4-b636-49aa-8ca6-7e0d4abedf64)
-  )
   (wire (pts (xy 146.05 34.29) (xy 146.05 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 799a648d-a74f-4b59-8a8b-0e0f39382bba)
@@ -4789,14 +4223,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7ad359d7-fb0e-425b-ac54-29b8f4378ef2)
   )
-  (wire (pts (xy 92.71 245.11) (xy 96.52 245.11))
+  (wire (pts (xy 92.71 267.97) (xy 96.52 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b75907b-b2ae-4362-89fa-d520339aaa5c)
   )
-  (wire (pts (xy 71.12 255.27) (xy 83.82 255.27))
+  (wire (pts (xy 71.12 278.13) (xy 83.82 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7ce4aab5-8271-4432-a4b1-bff168293b45)
   )
+  (wire (pts (xy 118.11 232.41) (xy 118.11 238.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7dda9fd3-9496-4995-b71d-6ea66e48526d)
+  )
   (wire (pts (xy 200.66 30.48) (xy 200.66 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7e16deda-d1e9-4ce8-869a-887e12216c03)
@@ -4813,15 +4251,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81c120d3-2399-465f-a201-e8e8a8ccd4df)
   )
-  (wire (pts (xy -34.29 113.03) (xy -34.29 119.38))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 82941cb3-7e8d-4836-8b43-647cd4390ab6)
-  )
-  (wire (pts (xy 118.11 245.11) (xy 121.92 245.11))
+  (wire (pts (xy 118.11 267.97) (xy 121.92 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83250ce3-cee5-48b2-8a3e-b1e7887d6a15)
   )
-  (polyline (pts (xy 156.21 261.62) (xy 59.69 261.62))
+  (polyline (pts (xy 156.21 284.48) (xy 59.69 284.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 832aec89-217a-4ba9-b247-80884d79c326)
   )
@@ -4878,7 +4312,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 89df70f4-3579-42b9-861e-6beb04a3b25e)
   )
-  (wire (pts (xy 138.43 53.34) (xy 138.43 67.31))
+  (wire (pts (xy 138.43 41.91) (xy 138.43 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8a27e5e0-7095-4086-a01a-ed8a8ab2ad0d)
   )
@@ -4887,7 +4321,7 @@
     (uuid 8a7f6552-d973-4f66-ba3a-dcd1ac0b119b)
   )
 
-  (wire (pts (xy 325.12 60.96) (xy 325.12 62.23))
+  (wire (pts (xy 317.5 46.99) (xy 317.5 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8c79c192-9f0e-4699-b9ba-2a8c6ba42712)
   )
@@ -4915,7 +4349,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90207e9d-650a-4c45-b7d5-e506cc85537d)
   )
-  (wire (pts (xy 121.92 255.27) (xy 134.62 255.27))
+  (wire (pts (xy 121.92 278.13) (xy 134.62 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90744d5e-9dab-4c38-a84a-09b4f88dc58e)
   )
@@ -4932,7 +4366,7 @@
     (uuid 944ed010-3de8-4cfe-831a-67ef38347180)
   )
 
-  (wire (pts (xy 147.32 236.22) (xy 147.32 245.11))
+  (wire (pts (xy 147.32 259.08) (xy 147.32 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9466b2ad-bfe1-4ba3-940d-c7a4a7d0a89c)
   )
@@ -4944,7 +4378,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 94e25012-d552-4148-9f26-d6096e3e0d16)
   )
-  (wire (pts (xy 105.41 255.27) (xy 109.22 255.27))
+  (wire (pts (xy 102.87 243.84) (xy 102.87 231.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9597bbc3-b09f-4bf0-9ed1-29b070d42b00)
+  )
+  (wire (pts (xy 105.41 278.13) (xy 109.22 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9600911d-0df3-419b-8d4a-8d1432a7daf2)
   )
@@ -4956,11 +4394,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 986467b0-d1bf-47a1-a37e-86028f8e433e)
   )
+  (wire (pts (xy 100.33 243.84) (xy 102.87 243.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 989dd327-6425-4d60-9a69-dd59ee9f6f4c)
+  )
   (wire (pts (xy 63.5 60.96) (xy 63.5 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 98cb7198-8cdb-49b4-a229-90ca976d9604)
   )
-  (wire (pts (xy 134.62 236.22) (xy 134.62 245.11))
+  (wire (pts (xy 134.62 259.08) (xy 134.62 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 991aff4d-a7d3-4a18-b3d9-53ef56bfa070)
   )
@@ -4976,11 +4418,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ac8d52f-2ab4-4046-a711-7a6674619533)
   )
-  (wire (pts (xy -44.45 119.38) (xy -44.45 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9ad8e352-005c-4299-8beb-56f3b58c96b7)
-  )
-  (wire (pts (xy 332.74 63.5) (xy 332.74 62.23))
+  (wire (pts (xy 325.12 49.53) (xy 325.12 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9b2fadc5-cfb1-4fc1-8ba7-7f994bda4f86)
   )
@@ -4992,7 +4430,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9b6c8d39-1c77-41a7-a65d-fd2dcab9608a)
   )
-  (wire (pts (xy 71.12 245.11) (xy 74.93 245.11))
+  (wire (pts (xy 71.12 267.97) (xy 74.93 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c0314b1-f82f-432d-95a0-65e191202552)
   )
@@ -5000,7 +4438,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9caefee8-6dcd-4815-b6e5-c75999fb9c90)
   )
-  (wire (pts (xy 105.41 245.11) (xy 109.22 245.11))
+  (wire (pts (xy 105.41 267.97) (xy 109.22 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9cd1ba63-2087-4000-a5a9-797dad78d993)
   )
@@ -5025,7 +4463,7 @@
     (uuid 9fd6d098-1128-4ceb-8d9e-00657ad9af26)
   )
 
-  (wire (pts (xy 115.57 233.68) (xy 115.57 231.14))
+  (wire (pts (xy 118.11 251.46) (xy 118.11 248.92))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9fd9c729-afbc-4d06-ad60-5dc91e23575e)
   )
@@ -5033,7 +4471,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a0cd6991-c54b-4b6c-adfc-0ca1b9236b7f)
   )
-  (wire (pts (xy 279.4 80.01) (xy 280.67 80.01))
+  (wire (pts (xy 271.78 66.04) (xy 279.4 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a115dc3b-1187-43e9-add5-00afa518554a)
   )
@@ -5058,10 +4496,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a20de0e7-dd28-42c8-b29a-5ac1168820dd)
   )
-  (wire (pts (xy 241.3 71.12) (xy 248.92 71.12))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a26ae05d-0f1a-4ab3-a979-1a5515cd11fc)
-  )
   (wire (pts (xy 335.28 208.28) (xy 335.28 226.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2e1f699-3a0b-465c-97ba-ad3dfae15c7a)
@@ -5094,7 +4528,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a6187c22-3622-4a1a-a49a-b21e96986f96)
   )
-  (wire (pts (xy 298.45 73.66) (xy 289.56 73.66))
+  (wire (pts (xy 290.83 59.69) (xy 281.94 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a61d144c-677f-4293-ba9f-55e94b5186d6)
   )
@@ -5106,10 +4540,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a670d8dd-e6e3-427b-b0e4-96e825469657)
   )
-  (wire (pts (xy -55.88 109.22) (xy -55.88 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a7035c1b-863b-4bbf-a32a-6ebba2814e2c)
-  )
   (wire (pts (xy 194.31 121.92) (xy 196.85 121.92))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a7489598-6db2-4ff0-8ef8-ca0cc5f3424d)
@@ -5134,7 +4564,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa31d3df-5cd9-471a-ae3f-ee1871b9a4f5)
   )
-  (wire (pts (xy 109.22 255.27) (xy 121.92 255.27))
+  (wire (pts (xy 109.22 278.13) (xy 121.92 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aac30e07-9da2-4f15-b289-3ca947351c45)
   )
@@ -5146,10 +4576,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab3a6108-d780-4153-aac5-d291908bed49)
   )
-  (wire (pts (xy 318.77 71.12) (xy 325.12 71.12))
+  (wire (pts (xy 311.15 57.15) (xy 317.5 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab3efb7a-dd19-4e73-a69b-e9444687bdfc)
   )
+  (wire (pts (xy 100.33 232.41) (xy 100.33 238.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ab8a7200-1897-4c62-9c11-e0b3db1b1513)
+  )
   (wire (pts (xy 153.67 -16.51) (xy 152.4 -16.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid acb025c1-3784-47d1-b5e9-772bcda8c549)
@@ -5162,7 +4596,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ad84c949-90f4-4ab6-b75d-9a22157a8121)
   )
-  (wire (pts (xy 71.12 236.22) (xy 71.12 245.11))
+  (wire (pts (xy 71.12 259.08) (xy 71.12 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ae4e99a2-9b94-42f4-9ce9-fc49689ab9f0)
   )
@@ -5183,7 +4617,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid afe1bfff-a9ef-40bc-9868-5d0708d986a5)
   )
-  (wire (pts (xy 121.92 245.11) (xy 125.73 245.11))
+  (wire (pts (xy 121.92 267.97) (xy 125.73 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b09870ad-8985-4a1c-a7b1-3acb9a1b9282)
   )
@@ -5228,7 +4662,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b5402cb1-f125-464d-b51f-9bbd89d0cf58)
   )
-  (wire (pts (xy 80.01 245.11) (xy 83.82 245.11))
+  (wire (pts (xy 80.01 267.97) (xy 83.82 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b632afec-1444-4246-8afb-cc14a57567e7)
   )
@@ -5240,7 +4674,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b6950d03-8cf8-49d4-a5ca-91b4fdfa9229)
   )
-  (wire (pts (xy 71.12 233.68) (xy 102.87 233.68))
+  (wire (pts (xy 71.12 251.46) (xy 100.33 251.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b758cdc4-d8c7-4a13-82b5-33ccb4564ebf)
   )
@@ -5252,7 +4686,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b7e50eae-7a65-4252-966a-2c158c8e8129)
   )
-  (wire (pts (xy 134.62 250.19) (xy 134.62 245.11))
+  (wire (pts (xy 134.62 273.05) (xy 134.62 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b853d9ac-7829-468f-99ac-dc9996502e94)
   )
@@ -5304,7 +4738,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd7a60ba-7561-4c78-be84-2d31ea3c9a90)
   )
-  (wire (pts (xy 71.12 250.19) (xy 71.12 245.11))
+  (wire (pts (xy 71.12 273.05) (xy 71.12 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be030c62-e776-405f-97d8-4a4c1aa2e428)
   )
@@ -5320,7 +4754,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bf6f283f-0953-44aa-b703-3c7098a50fef)
   )
-  (wire (pts (xy 269.24 71.12) (xy 274.32 71.12))
+  (wire (pts (xy 261.62 57.15) (xy 266.7 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bfeebcc7-cbd3-4df8-85ba-0ba757e2fcef)
   )
@@ -5332,15 +4766,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c0a890f8-ad2e-4ba9-a76b-c8678e93a97e)
   )
-  (wire (pts (xy 318.77 60.96) (xy 325.12 60.96))
+  (wire (pts (xy 311.15 46.99) (xy 317.5 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c0ba8559-eb09-42c4-8da3-665532c4020b)
   )
-  (wire (pts (xy 96.52 245.11) (xy 100.33 245.11))
+  (wire (pts (xy 96.52 267.97) (xy 100.33 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c10ace36-a93c-4c08-ac75-059ef9e1f71c)
   )
-  (wire (pts (xy 109.22 250.19) (xy 109.22 245.11))
+  (wire (pts (xy 109.22 273.05) (xy 109.22 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c1518dae-2aaf-4360-9028-98a626546353)
   )
@@ -5376,9 +4810,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c339b7f7-fe73-4c78-92da-a2470bc8db79)
   )
-  (wire (pts (xy 113.03 48.26) (xy 115.57 48.26))
+  (wire (pts (xy 100.33 232.41) (xy 100.33 231.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c455797c-9957-4f4e-b9fa-bc8fb19e8195)
+    (uuid c451828c-0b4e-4ddc-a064-1937638f991e)
   )
   (wire (pts (xy 138.43 33.02) (xy 138.43 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5409,9 +4843,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c7be7ce7-19ce-4a48-ae04-71b6b7b179dd)
   )
-  (wire (pts (xy 99.06 231.14) (xy 100.33 231.14))
+  (wire (pts (xy 115.57 243.84) (xy 115.57 231.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c7f523d2-7966-4884-9a2c-a5a340a26c59)
+    (uuid c8289006-9b17-4a2b-bde7-de5b9a34c143)
   )
   (wire (pts (xy 314.96 114.3) (xy 331.47 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5429,10 +4863,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cad44c02-7fd2-4e9a-b93a-e1b73d6a3ee6)
   )
-  (wire (pts (xy 140.97 63.5) (xy 140.97 48.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid caf4bd7d-8693-44f4-ab03-fdf656a5b153)
-  )
   (polyline (pts (xy 176.53 71.12) (xy 222.25 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb200f8a-5e17-412c-870a-c42dc4524d12)
@@ -5490,7 +4920,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d0143b39-47c0-41cb-bed3-83e9c24397f8)
   )
-  (wire (pts (xy 96.52 255.27) (xy 105.41 255.27))
+  (wire (pts (xy 96.52 278.13) (xy 105.41 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d017347c-cbb9-4df4-89ab-31f58a831157)
   )
@@ -5522,10 +4952,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3888cc0-e66e-443f-b378-d49d3f102668)
   )
-  (wire (pts (xy 114.3 38.1) (xy 114.3 53.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d3bb729c-910c-4fdd-827c-56be97b1f1e9)
-  )
   (wire (pts (xy 342.9 123.19) (xy 342.9 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3db736b-0e33-4126-b950-5488923df40e)
@@ -5534,10 +4960,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3fd96c3-0379-403f-99e1-e3d6e8baf4a6)
   )
-  (wire (pts (xy 135.89 48.26) (xy 140.97 48.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d4627db6-1a49-40c4-8376-8ee65063d491)
-  )
   (wire (pts (xy 356.87 208.28) (xy 354.33 208.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d49d33a5-c0cd-4f05-819d-be9284b21a2e)
@@ -5563,10 +4985,6 @@
     (uuid d7a7b921-fc1c-46fd-9115-35227b95c19c)
   )
 
-  (wire (pts (xy -63.5 114.3) (xy -66.04 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d7b67c11-d515-46cf-bcf0-0f0ef2d0158a)
-  )
   (wire (pts (xy 323.215 199.39) (xy 323.215 198.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d7de2887-c7b2-4bb7-a339-632f4f906224)
@@ -5603,11 +5021,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e053d785-20a7-40a8-8d3a-996b9045335f)
   )
-  (wire (pts (xy 115.57 63.5) (xy 113.03 63.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e066aaf0-b36b-49d7-8b1f-dea523acf3c6)
-  )
-  (wire (pts (xy 269.24 55.88) (xy 294.64 55.88))
+  (wire (pts (xy 261.62 41.91) (xy 287.02 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e19529e9-82a2-4e76-bd0b-a07abbc89513)
   )
@@ -5639,11 +5053,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e438671c-4449-4945-a835-a89118779b0b)
   )
-  (wire (pts (xy 83.82 245.11) (xy 87.63 245.11))
+  (wire (pts (xy 83.82 267.97) (xy 87.63 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e46ecd61-0bbe-4b9f-a151-a2cacac5967b)
   )
-  (wire (pts (xy 114.3 38.1) (xy 102.87 38.1))
+  (wire (pts (xy 102.87 38.1) (xy 115.57 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e56463e9-c4f5-4bd2-84fc-c568db547d3e)
   )
@@ -5667,7 +5081,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8e23712-f080-4685-ae22-9028780f7b13)
   )
-  (wire (pts (xy 274.32 71.12) (xy 274.32 66.04))
+  (wire (pts (xy 266.7 57.15) (xy 266.7 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9b9f6ca-b237-4bc6-befc-b08e2e73e1cf)
   )
@@ -5732,7 +5146,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f27c332a-88e7-4fa6-a134-a788135fe901)
   )
-  (wire (pts (xy 325.12 71.12) (xy 332.74 71.12))
+  (wire (pts (xy 317.5 57.15) (xy 325.12 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f2900cc1-3041-4eee-a773-b9d14053bbe4)
   )
@@ -5760,7 +5174,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f666b13b-6c9f-4bff-a8e4-83fb3529e4da)
   )
-  (wire (pts (xy 335.28 62.23) (xy 332.74 62.23))
+  (wire (pts (xy 327.66 48.26) (xy 325.12 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6b67fe8-cddc-463a-a9ee-225a85050a7f)
   )
@@ -5797,10 +5211,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fa1e8557-d5b7-43f5-8d23-89d027fc081d)
   )
-  (wire (pts (xy -55.88 119.38) (xy -59.69 119.38))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fb4e7351-d265-4999-adf6-bc7596c21cf3)
-  )
   (wire (pts (xy 72.39 68.58) (xy 82.55 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fb57d6ef-0554-4ce0-b3f0-a807b2bfd312)
@@ -5825,18 +5235,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fd102ec6-a5c0-4548-95d8-2880a23a29d4)
   )
-  (wire (pts (xy 135.89 53.34) (xy 138.43 53.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fd713302-672f-42fe-8665-f1139afcc6cf)
-  )
   (wire (pts (xy 344.17 167.64) (xy 349.25 167.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe431a80-868e-482d-aa91-c96eb8387d6a)
   )
-  (wire (pts (xy 115.57 53.34) (xy 114.3 53.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fe46571b-bee9-4ac1-91f2-2cfd0f1b8c41)
-  )
   (wire (pts (xy 63.5 63.5) (xy 64.77 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe9130c2-6b56-4e7f-a82b-4f0c77013a03)
@@ -5863,7 +5265,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 673b2826-2598-46b3-8be9-1e7d41ba8534)
   )
-  (text "TODO\nCalculate overall gain\nRecalculate all filters, make Chebychev\nDefine how to do CW\nAdditional switching for IF needed?\nVoltage reg for IF amps (hybrid cascode: 9V)\nMixer termination\nGain stage on 28MHz?\n\nDone\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
+  (text "TODO\nXTAL filter match\nCalculate overall gain\nRecalculate all filters, make Chebychev\nDefine how to do CW\nAdditional switching for IF needed?\nVoltage reg for IF amps (hybrid cascode: 9V)\nMixer termination\nGain stage on 28MHz?\n\nDone\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
     (at -104.14 -41.91 0)
     (effects (font (size 3 3) bold) (justify left bottom))
     (uuid 74c68bd1-c5af-4a14-af9a-5d066dace5fa)
@@ -6051,7 +5453,7 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2d0d333a-99a0-4575-9433-710c8cc7ac0b)
   )
-  (hierarchical_label "LO1" (shape input) (at 342.9 62.23 0)
+  (hierarchical_label "LO1" (shape input) (at 335.28 48.26 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2f36acc3-4875-4a93-b8b3-0114942eddc7)
   )
@@ -6063,10 +5465,6 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 51320c8c-9c4a-48b8-a7b8-e2c8d1f2e5ad)
   )
-  (hierarchical_label "SWITCH_RELAYn" (shape input) (at -83.82 114.3 180)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 57e17378-f1f7-42d0-9ad3-fb44c2d5cdc3)
-  )
   (hierarchical_label "MUTE_SPKR" (shape input) (at 317.5 231.14 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7147b342-4ca8-4694-a1ec-b615c151a5d0)
@@ -6075,7 +5473,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9a88d63d-f7e5-416d-9807-a8e942aef287)
   )
-  (hierarchical_label "HF" (shape input) (at 280.67 80.01 0)
+  (hierarchical_label "HF" (shape bidirectional) (at 279.4 66.04 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid db86850d-044a-454c-9934-3c394c2264e6)
   )
@@ -6166,176 +5564,176 @@
     (pin "1" (uuid a907c940-e329-41a7-a3b9-b2b6af3699f7))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 71.12 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 71.12 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e348fc2)
-    (property "Reference" "C?" (id 0) (at 73.4568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 73.4568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "DNF" (id 1) (at 73.4568 253.873 0)
+    (property "Value" "DNF" (id 1) (at 73.4568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 71.12 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 71.12 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 71.12 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 71.12 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 71.12 252.73 0)
+    (property "MPN" "" (id 4) (at 71.12 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 71.12 252.73 0)
+    (property "Need_order" "" (id 5) (at 71.12 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 721b9fc3-aa35-42eb-9b4a-e5c0088a1b7e))
     (pin "2" (uuid 39d88a7e-4ec2-446c-92df-1dfb5aad46bc))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 147.32 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 147.32 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3499c6)
-    (property "Reference" "C?" (id 0) (at 149.6568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 149.6568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "DNF" (id 1) (at 149.6568 253.873 0)
+    (property "Value" "DNF" (id 1) (at 149.6568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 147.32 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 147.32 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 147.32 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 147.32 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 147.32 252.73 0)
+    (property "MPN" "" (id 4) (at 147.32 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 147.32 252.73 0)
+    (property "Need_order" "" (id 5) (at 147.32 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8756e628-dd24-443f-a36a-1623f1b934e8))
     (pin "2" (uuid 4d9063f6-faee-473b-9291-07dede8bcc11))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 83.82 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 83.82 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e349d5b)
-    (property "Reference" "C?" (id 0) (at 86.1568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 86.1568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "68pF" (id 1) (at 86.1568 253.873 0)
+    (property "Value" "68pF" (id 1) (at 86.1568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 83.82 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 83.82 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 83.82 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 83.82 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 83.82 252.73 0)
+    (property "MPN" "" (id 4) (at 83.82 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 83.82 252.73 0)
+    (property "Need_order" "" (id 5) (at 83.82 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cac5a94a-f6c9-4f99-a205-bf7b4100bcc3))
     (pin "2" (uuid b139aaec-473f-40e8-be59-670ef4b51501))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 77.47 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 77.47 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e34b1e0)
-    (property "Reference" "Y?" (id 0) (at 77.47 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 77.47 241.7064 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 77.47 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 77.47 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 77.47 264.5664 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 77.47 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 77.47 245.11 0)
+    (property "Datasheet" "" (id 3) (at 77.47 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 77.47 245.11 0)
+    (property "MPN" "" (id 4) (at 77.47 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 77.47 245.11 0)
+    (property "Need_order" "" (id 5) (at 77.47 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ceae1a21-5377-420e-9600-62f664802aef))
     (pin "2" (uuid 52da654e-8184-43f3-b96f-be891798dc51))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 90.17 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 90.17 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e34b5d1)
-    (property "Reference" "Y?" (id 0) (at 90.17 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 90.17 241.7064 0))
-    (property "Footprint" "" (id 2) (at 90.17 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 90.17 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 90.17 264.5664 0))
+    (property "Footprint" "" (id 2) (at 90.17 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 90.17 245.11 0)
+    (property "Datasheet" "" (id 3) (at 90.17 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 90.17 245.11 0)
+    (property "MPN" "" (id 4) (at 90.17 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 90.17 245.11 0)
+    (property "Need_order" "" (id 5) (at 90.17 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1acbf004-08dd-4baf-81e6-7134d2890f6d))
     (pin "2" (uuid ff89d7f3-4e54-42a0-a84c-d29071e8d413))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 102.87 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 102.87 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e34b7fc)
-    (property "Reference" "Y?" (id 0) (at 102.87 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 102.87 241.7064 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 102.87 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 102.87 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 102.87 264.5664 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 102.87 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 102.87 245.11 0)
+    (property "Datasheet" "" (id 3) (at 102.87 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 102.87 245.11 0)
+    (property "MPN" "" (id 4) (at 102.87 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 102.87 245.11 0)
+    (property "Need_order" "" (id 5) (at 102.87 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 39301ce5-d235-4a3f-9b70-c9e4aac21159))
     (pin "2" (uuid 07c4a991-c32d-4396-8b5f-f999aa56c4ca))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 115.57 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 115.57 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e34bba5)
-    (property "Reference" "Y?" (id 0) (at 115.57 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 115.57 241.7064 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 115.57 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 115.57 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 115.57 264.5664 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 115.57 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 115.57 245.11 0)
+    (property "Datasheet" "" (id 3) (at 115.57 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 115.57 245.11 0)
+    (property "MPN" "" (id 4) (at 115.57 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 115.57 245.11 0)
+    (property "Need_order" "" (id 5) (at 115.57 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2addc150-a616-417e-87c2-d64f7286cb9d))
     (pin "2" (uuid 78446c37-2224-45ff-a200-567c12535d8f))
   )
 
-  (symbol (lib_id "power:GNDA") (at 105.41 255.27 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 105.41 278.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3a94e5)
-    (property "Reference" "#PWR?" (id 0) (at 105.41 261.62 0)
+    (property "Reference" "#PWR?" (id 0) (at 105.41 284.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 105.537 259.6642 0))
-    (property "Footprint" "" (id 2) (at 105.41 255.27 0)
+    (property "Value" "GNDA" (id 1) (at 105.537 282.5242 0))
+    (property "Footprint" "" (id 2) (at 105.41 278.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 105.41 255.27 0)
+    (property "Datasheet" "" (id 3) (at 105.41 278.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8c98fed0-59cf-439c-9da3-211c5b1353e2))
@@ -7864,31 +7262,6 @@
     (pin "2" (uuid 65a07ae8-a245-47bf-b897-b3a6c7e319e2))
   )
 
-  (symbol (lib_id "Diode:1N4148W") (at -59.69 127 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ea3288a)
-    (property "Reference" "D?" (id 0) (at -61.722 125.8316 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "1N4148W" (id 1) (at -61.722 128.143 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123F" (id 2) (at -64.135 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://www.vishay.com/docs/85748/1n4148w.pdf" (id 3) (at -59.69 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "1N4148W" (id 4) (at -59.69 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at -59.69 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e4407285-ba2d-440b-b3fb-44047f55f1c2))
-    (pin "2" (uuid 82f69fb8-2861-4b41-a5cb-6d1117a2fb53))
-  )
-
   (symbol (lib_id "Device:R") (at 323.85 139.7 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005ea588a6)
@@ -7910,34 +7283,6 @@
     (pin "2" (uuid 3c8256f1-0b55-4038-9966-4f0475fb0575))
   )
 
-  (symbol (lib_id "Relay:G6K-2") (at -41.91 127 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ea70218)
-    (property "Reference" "K?" (id 0) (at -25.908 125.8316 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "G6K-2F-RF-3V" (id 1) (at -25.908 128.143 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Relay_SMD:Relay_DPDT_Omron_G6K-2F" (id 2) (at -41.91 127 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "http://omronfs.omron.com/en_US/ecb/products/pdf/en-g6k.pdf" (id 3) (at -41.91 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at -41.91 127 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 8789eb8e-4d2a-4cc4-98ac-af4ff76788c8))
-    (pin "2" (uuid 29b10f60-1cff-4c01-a21a-260e3d6da2a7))
-    (pin "3" (uuid 1cba954c-77d0-4b7b-b82b-9d25e2163660))
-    (pin "4" (uuid 9c1f61b4-fbd1-4e0c-85a5-99264e752852))
-    (pin "5" (uuid 40a52e92-6bd3-4c9a-aaf3-2894dfd0f277))
-    (pin "6" (uuid 3106e69e-b919-421f-87a1-49f3ff2e7250))
-    (pin "7" (uuid 88808988-f0eb-47a0-98bd-9325294bff2c))
-    (pin "8" (uuid 3530f05c-d800-421f-82b4-61b5c42d3a39))
-  )
-
   (symbol (lib_id "power:GNDA") (at 326.39 135.89 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005eac2fea)
@@ -7956,129 +7301,6 @@
     (pin "1" (uuid 8fbad2f1-2fd2-411a-95a7-db232f2a9873))
   )
 
-  (symbol (lib_id "power:+3.3V") (at -55.88 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ecca8c1)
-    (property "Reference" "#PWR?" (id 0) (at -55.88 110.49 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at -58.42 102.87 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at -55.88 106.68 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at -55.88 106.68 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 080f996a-2edd-4411-9a65-822033151116))
-  )
-
-  (symbol (lib_id "Transistor_BJT:BC856W") (at -58.42 114.3 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ed2eec6)
-    (property "Reference" "Q?" (id 0) (at -53.594 113.1316 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "BC856W" (id 1) (at -53.594 115.443 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70" (id 2) (at -53.34 112.395 0)
-      (effects (font (size 1.27 1.27) italic) (justify left) hide)
-    )
-    (property "Datasheet" "http://www.fairchildsemi.com/ds/BC/BC856.pdf" (id 3) (at -58.42 114.3 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "MPN" "BC856W" (id 4) (at -58.42 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at -58.42 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7ddb0629-def7-4798-8950-bcc65a0fc385))
-    (pin "2" (uuid 85c1848b-ad32-4339-9674-72c81d4dbc8a))
-    (pin "3" (uuid 27c02fc1-9e32-42a3-8454-9dc580f3887f))
-  )
-
-  (symbol (lib_id "Device:R") (at -66.04 110.49 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ed2eecc)
-    (property "Reference" "R?" (id 0) (at -64.262 109.3216 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "4k7" (id 1) (at -64.262 111.633 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at -67.818 110.49 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at -66.04 110.49 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at -66.04 110.49 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 99d33e99-22eb-44a6-989f-56faf1bf179e))
-    (pin "2" (uuid cbfc5cfe-8391-44f7-9cc8-6e1418ef24ad))
-  )
-
-  (symbol (lib_id "Diode:1N4148W") (at -80.01 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ed2eed3)
-    (property "Reference" "D?" (id 0) (at -80.01 108.7882 0))
-    (property "Value" "1N4148W" (id 1) (at -80.01 111.0996 0))
-    (property "Footprint" "Diode_SMD:D_SOD-123F" (id 2) (at -80.01 118.745 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://www.vishay.com/docs/85748/1n4148w.pdf" (id 3) (at -80.01 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "1N4148W" (id 4) (at -80.01 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at -80.01 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c2e43950-11e0-4cf1-aef3-80fe6bab529c))
-    (pin "2" (uuid be490a15-a221-4b3d-9bf0-9510d466e80b))
-  )
-
-  (symbol (lib_id "power:GND") (at -59.69 134.62 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005edc4bf1)
-    (property "Reference" "#PWR?" (id 0) (at -66.04 134.62 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at -62.9412 134.747 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at -59.69 134.62 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at -59.69 134.62 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 58abb8dc-e6a5-4aac-89b9-6f3ff72457cf))
-  )
-
-  (symbol (lib_id "Device:R") (at -72.39 114.3 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005ee2a6bc)
-    (property "Reference" "R?" (id 0) (at -72.39 109.0422 90))
-    (property "Value" "100" (id 1) (at -72.39 111.3536 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at -72.39 112.522 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at -72.39 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at -72.39 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a9a87684-4b39-42b8-a3f6-b4bbf3a4ae67))
-    (pin "2" (uuid 7580d03c-a102-41c5-9c6b-95691ca1ad7c))
-  )
-
   (symbol (lib_id "Connector:TestPoint") (at 306.07 167.64 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005eed9f23)
@@ -8116,42 +7338,42 @@
     (pin "1" (uuid eca3c34c-2693-4881-981f-5f8ecac6050b))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 128.27 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 128.27 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f098134)
-    (property "Reference" "Y?" (id 0) (at 128.27 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 128.27 241.7064 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 128.27 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 128.27 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 128.27 264.5664 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 128.27 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 128.27 245.11 0)
+    (property "Datasheet" "" (id 3) (at 128.27 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 128.27 245.11 0)
+    (property "MPN" "" (id 4) (at 128.27 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 128.27 245.11 0)
+    (property "Need_order" "" (id 5) (at 128.27 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 21fc63cc-71f6-418a-ba3f-cb6d9586f523))
     (pin "2" (uuid 184ac5ad-d287-402f-b65e-c0863e6ca5fd))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 140.97 245.11 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 140.97 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f0985bb)
-    (property "Reference" "Y?" (id 0) (at 140.97 239.395 0))
-    (property "Value" "11.0592MHz" (id 1) (at 140.97 241.7064 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 140.97 245.11 0)
+    (property "Reference" "Y?" (id 0) (at 140.97 262.255 0))
+    (property "Value" "11.0592MHz" (id 1) (at 140.97 264.5664 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 140.97 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 140.97 245.11 0)
+    (property "Datasheet" "" (id 3) (at 140.97 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 140.97 245.11 0)
+    (property "MPN" "" (id 4) (at 140.97 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 140.97 245.11 0)
+    (property "Need_order" "" (id 5) (at 140.97 267.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid dd488d04-2812-4120-afcd-2e3e089f5689))
@@ -8309,25 +7531,25 @@
     (pin "2" (uuid b1a448cd-10f6-463e-8f67-30d72eef3708))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 121.92 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 121.92 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 101deb94-0050-42b8-8bf3-488fdee33f31)
-    (property "Reference" "C?" (id 0) (at 124.2568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 124.2568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "68pF" (id 1) (at 124.2568 253.873 0)
+    (property "Value" "68pF" (id 1) (at 124.2568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 121.92 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 121.92 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 121.92 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 121.92 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 121.92 252.73 0)
+    (property "MPN" "" (id 4) (at 121.92 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 121.92 252.73 0)
+    (property "Need_order" "" (id 5) (at 121.92 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 454186b2-d79f-424b-850d-6135386f9f81))
@@ -8360,22 +7582,22 @@
     (pin "3" (uuid 2a48692f-97d0-481d-a29a-520c15748fcd))
   )
 
-  (symbol (lib_id "Device:R") (at 325.12 67.31 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 317.5 53.34 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 12be2bc4-69b1-41e1-b853-fa71c6fd8df3)
-    (property "Reference" "R?" (id 0) (at 327.66 66.0399 0)
+    (property "Reference" "R?" (id 0) (at 320.04 52.0699 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "150" (id 1) (at 327.66 68.5799 0)
+    (property "Value" "150" (id 1) (at 320.04 54.6099 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 326.898 67.31 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 319.278 53.34 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 325.12 67.31 0)
+    (property "Datasheet" "~" (id 3) (at 317.5 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 325.12 67.31 0)
+    (property "Need_order" "" (id 4) (at 317.5 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0fc83325-870c-4e8b-9e1f-e44c244ead44))
@@ -8459,18 +7681,18 @@
     (pin "2" (uuid 7eb90f53-b20c-4cd3-bee3-eaf5ffdd71f1))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 259.08 66.04 0) (unit 1)
+  (symbol (lib_id "Device:Transformer_1P_SS") (at 251.46 52.07 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 168ee993-6a85-48af-b8f8-0d87ada9138a)
-    (property "Reference" "T?" (id 0) (at 259.0927 55.88 0))
-    (property "Value" "10t tri, 43" (id 1) (at 259.0927 58.42 0))
-    (property "Footprint" "" (id 2) (at 259.08 66.04 0)
+    (property "Reference" "T?" (id 0) (at 251.4727 41.91 0))
+    (property "Value" "10t tri, 43" (id 1) (at 251.4727 44.45 0))
+    (property "Footprint" "" (id 2) (at 251.46 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 259.08 66.04 0)
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 251.46 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "5943004901" (id 4) (at 259.08 66.04 90)
+    (property "MPN" "5943004901" (id 4) (at 251.46 52.07 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d837f874-2731-4f58-92c6-251dd6c0514d))
@@ -8480,22 +7702,22 @@
     (pin "5" (uuid 60103118-7c04-4430-ab04-686a621c3b34))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 318.77 60.96 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint") (at 311.15 46.99 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1690b0f5-b1ed-48f5-9f69-a16ed90eddd0)
-    (property "Reference" "TP?" (id 0) (at 317.5 52.07 0)
+    (property "Reference" "TP?" (id 0) (at 309.88 38.1 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "LO1" (id 1) (at 317.5 54.61 0)
+    (property "Value" "LO1" (id 1) (at 309.88 40.64 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 323.85 60.96 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 316.23 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 323.85 60.96 0)
+    (property "Datasheet" "~" (id 3) (at 316.23 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 318.77 60.96 0)
+    (property "Need_order" "" (id 4) (at 311.15 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 78cb0744-c482-43fd-baf5-61957bb86d72))
@@ -8529,19 +7751,19 @@
     (pin "2" (uuid f8b9cd7e-39ad-46dc-9e60-033a3a6a249a))
   )
 
-  (symbol (lib_id "power:GNDA") (at 318.77 71.12 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 311.15 57.15 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 185efd6b-f96f-4eeb-a457-2c5727f22e1b)
-    (property "Reference" "#PWR?" (id 0) (at 318.77 77.47 0)
+    (property "Reference" "#PWR?" (id 0) (at 311.15 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 318.77 76.2 0)
+    (property "Value" "GNDA" (id 1) (at 311.15 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 318.77 71.12 0)
+    (property "Footprint" "" (id 2) (at 311.15 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 318.77 71.12 0)
+    (property "Datasheet" "" (id 3) (at 311.15 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2b48aab2-ec97-4bf6-b686-0af28d81a1b5))
@@ -8879,6 +8101,29 @@
     (pin "2" (uuid b301063c-d8d2-45dd-9062-ffb31bfcfd70))
   )
 
+  (symbol (lib_id "Device:Transformer_1P_SS") (at 128.27 243.84 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 2759d25b-2b4f-44e4-b729-9eee6231471c)
+    (property "Reference" "T?" (id 0) (at 128.2573 236.22 0))
+    (property "Value" "P: 16T S:2T on 43 or MABA-009488" (id 1) (at 128.2573 236.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 128.27 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 128.27 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 128.27 243.84 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bc12b182-face-436b-bff7-c5ff6374f969))
+    (pin "2" (uuid 2311217b-365d-4796-950a-4c12d1ce5d14))
+    (pin "3" (uuid a552c692-3c9b-4fd1-b93c-e1f2dff3384d))
+    (pin "4" (uuid cbe82e36-2d82-4a91-a5af-6ca30e0a5544))
+    (pin "5" (uuid af472163-95bd-41cd-9d65-9fa72815a62e))
+  )
+
   (symbol (lib_id "Device:R") (at 83.82 134.62 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 27b2c022-8e6d-4bc4-b68f-aed962065bfe)
@@ -8919,22 +8164,22 @@
     (pin "1" (uuid 44dfcb39-4f4b-434b-9044-05361d4bdeeb))
   )
 
-  (symbol (lib_id "Device:R") (at 271.78 83.82 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 264.16 69.85 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2c4d679d-68ef-46f3-b0bc-ef543fc52489)
-    (property "Reference" "R?" (id 0) (at 274.32 82.5499 0)
+    (property "Reference" "R?" (id 0) (at 266.7 68.5799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 274.32 85.0899 0)
+    (property "Value" "DNF" (id 1) (at 266.7 71.1199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 270.002 83.82 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 262.382 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 271.78 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 264.16 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 271.78 83.82 0)
+    (property "Need_order" "" (id 4) (at 264.16 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 568fd184-43de-4cc3-9986-a2d3c46543ce))
@@ -8985,19 +8230,19 @@
     (pin "1" (uuid fb05adf6-583d-4456-bb2e-2078b1c953f7))
   )
 
-  (symbol (lib_id "power:GNDA") (at 119.38 231.14 90) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 118.11 232.41 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2e4a28c3-3a7b-4f10-af99-7afc7a04f658)
-    (property "Reference" "#PWR?" (id 0) (at 125.73 231.14 0)
+    (property "Reference" "#PWR?" (id 0) (at 124.46 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 123.19 231.1399 90)
+    (property "Value" "GNDA" (id 1) (at 121.92 232.4099 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 119.38 231.14 0)
+    (property "Footprint" "" (id 2) (at 118.11 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 119.38 231.14 0)
+    (property "Datasheet" "" (id 3) (at 118.11 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a04683ec-00c7-407f-94ca-5a4f4ef92b05))
@@ -9090,25 +8335,25 @@
     (pin "2" (uuid 17762601-2e93-4d43-9b06-9d7236bbc748))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 134.62 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 134.62 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3362462d-aa48-4506-8fdc-fed4c6bd7feb)
-    (property "Reference" "C?" (id 0) (at 136.9568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 136.9568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "68pF" (id 1) (at 136.9568 253.873 0)
+    (property "Value" "68pF" (id 1) (at 136.9568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 134.62 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 134.62 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 134.62 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 134.62 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 134.62 252.73 0)
+    (property "MPN" "" (id 4) (at 134.62 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 134.62 252.73 0)
+    (property "Need_order" "" (id 5) (at 134.62 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 12bb53bc-7a6c-45e3-970b-a1cb9bdfd96b))
@@ -9342,21 +8587,21 @@
     (pin "2" (uuid 0f78ce7b-9ee2-42a0-9ad6-2f8397fa3fc8))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 77.47 236.22 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 77.47 259.08 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3b9bbec7-5106-4cae-98f0-82135e1ca47d)
-    (property "Reference" "Y?" (id 0) (at 77.47 230.505 0))
-    (property "Value" "11.0592MHz" (id 1) (at 77.47 232.8164 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 77.47 236.22 0)
+    (property "Reference" "Y?" (id 0) (at 77.47 253.365 0))
+    (property "Value" "11.0592MHz" (id 1) (at 77.47 255.6764 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 77.47 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 77.47 236.22 0)
+    (property "Datasheet" "" (id 3) (at 77.47 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 77.47 236.22 0)
+    (property "MPN" "" (id 4) (at 77.47 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 77.47 236.22 0)
+    (property "Need_order" "" (id 5) (at 77.47 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 231df7d9-794a-4f5f-957f-f4191bac33b6))
@@ -9754,18 +8999,18 @@
     (pin "2" (uuid 74e816d9-4ae9-4a46-8765-909273d1951a))
   )
 
-  (symbol (lib_id "Device:R") (at 328.93 62.23 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 321.31 48.26 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f5f8aae-629e-4775-8fef-7d9a1b8f5100)
-    (property "Reference" "R?" (id 0) (at 328.93 55.88 90))
-    (property "Value" "33" (id 1) (at 328.93 58.42 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 328.93 64.008 90)
+    (property "Reference" "R?" (id 0) (at 321.31 41.91 90))
+    (property "Value" "33" (id 1) (at 321.31 44.45 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 321.31 50.038 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 328.93 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 321.31 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 328.93 62.23 0)
+    (property "Need_order" "" (id 4) (at 321.31 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f071f209-6089-4f25-ba8a-ccfaa0422052))
@@ -9877,19 +9122,19 @@
     (pin "2" (uuid 6071c656-ca66-47cc-b106-2160c2ab6009))
   )
 
-  (symbol (lib_id "power:GNDA") (at 279.4 87.63 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 271.78 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5461d9bb-9179-420e-bf46-2682a2c1b304)
-    (property "Reference" "#PWR?" (id 0) (at 279.4 93.98 0)
+    (property "Reference" "#PWR?" (id 0) (at 271.78 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 279.527 92.0242 0)
+    (property "Value" "GNDA" (id 1) (at 271.907 78.0542 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 279.4 87.63 0)
+    (property "Footprint" "" (id 2) (at 271.78 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 279.4 87.63 0)
+    (property "Datasheet" "" (id 3) (at 271.78 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ac827f58-0d63-4b3b-8d7b-b185d2b387aa))
@@ -9959,43 +9204,43 @@
     (pin "2" (uuid afbaf5d8-021d-4830-be0b-0829b8d3b9f9))
   )
 
-  (symbol (lib_id "power:GNDA") (at 298.45 66.04 270) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 290.83 52.07 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5a4791ba-491f-4432-961f-1b249da54e4f)
-    (property "Reference" "#PWR?" (id 0) (at 292.1 66.04 0)
+    (property "Reference" "#PWR?" (id 0) (at 284.48 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 294.0558 66.167 0)
+    (property "Value" "GNDA" (id 1) (at 286.4358 52.197 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 298.45 66.04 0)
+    (property "Footprint" "" (id 2) (at 290.83 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 298.45 66.04 0)
+    (property "Datasheet" "" (id 3) (at 290.83 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f34a3f2c-7828-4621-b257-e6d486360d18))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 109.22 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 109.22 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5a9a14a2-a94b-4a05-89b3-2d881c558bbc)
-    (property "Reference" "C?" (id 0) (at 111.5568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 111.5568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "68pF" (id 1) (at 111.5568 253.873 0)
+    (property "Value" "68pF" (id 1) (at 111.5568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 109.22 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 109.22 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 109.22 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 109.22 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 109.22 252.73 0)
+    (property "MPN" "" (id 4) (at 109.22 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 109.22 252.73 0)
+    (property "Need_order" "" (id 5) (at 109.22 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e9dc9dca-64d7-4f2a-9ae5-b1cdff1c24c6))
@@ -10123,19 +9368,19 @@
     (pin "2" (uuid 3f2af811-2ea0-433c-bf67-f820e2a27f60))
   )
 
-  (symbol (lib_id "power:GNDA") (at 271.78 87.63 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 264.16 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 646d3e54-9093-4252-b307-92e0d00f0257)
-    (property "Reference" "#PWR?" (id 0) (at 271.78 93.98 0)
+    (property "Reference" "#PWR?" (id 0) (at 264.16 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 271.907 92.0242 0)
+    (property "Value" "GNDA" (id 1) (at 264.287 78.0542 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 271.78 87.63 0)
+    (property "Footprint" "" (id 2) (at 264.16 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 271.78 87.63 0)
+    (property "Datasheet" "" (id 3) (at 264.16 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ba758faa-b4d3-4e40-9bf2-38eb2fa25222))
@@ -10638,6 +9883,29 @@
     (pin "2" (uuid 1f6e5264-f71d-493f-913a-cdb6564c86bf))
   )
 
+  (symbol (lib_id "Device:Transformer_1P_SS") (at 125.73 43.18 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 863eb863-4675-4f95-81b6-2b036db3d5eb)
+    (property "Reference" "T?" (id 0) (at 125.7173 35.56 0))
+    (property "Value" "P: 16T S:2T on 43 or MABA-009488" (id 1) (at 125.7173 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 125.73 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 125.73 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 125.73 43.18 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid de3775dc-9693-4517-b1e1-44c84775da78))
+    (pin "2" (uuid b31b9a85-9cda-40fa-8e0d-3432ab9c40fa))
+    (pin "3" (uuid 20b8bce5-bbd7-4bb6-88b3-201e0cc7a164))
+    (pin "4" (uuid 091168ab-16b0-4f56-94e5-a11467c5aca6))
+    (pin "5" (uuid f14f4be0-c19a-4fda-b2a8-2552210ff9af))
+  )
+
   (symbol (lib_id "power:GNDA") (at 24.13 53.34 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 86505c6e-7b4d-40aa-b35a-733e60478123)
@@ -10735,22 +10003,22 @@
     (pin "2" (uuid 66967e5c-4b3a-41e5-abdd-4c633cb66941))
   )
 
-  (symbol (lib_id "Device:R") (at 332.74 67.31 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 325.12 53.34 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 897dc223-825b-44ae-b85b-e3b24c46393b)
-    (property "Reference" "R?" (id 0) (at 335.28 66.0399 0)
+    (property "Reference" "R?" (id 0) (at 327.66 52.0699 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "150" (id 1) (at 335.28 68.5799 0)
+    (property "Value" "150" (id 1) (at 327.66 54.6099 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 334.518 67.31 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 326.898 53.34 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 332.74 67.31 0)
+    (property "Datasheet" "~" (id 3) (at 325.12 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 332.74 67.31 0)
+    (property "Need_order" "" (id 4) (at 325.12 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2adc0e8f-2e3a-4906-88b1-092f214393c7))
@@ -10836,6 +10104,29 @@
     (pin "2" (uuid 060b50cc-dfb0-4051-bf14-860fe9cdb674))
   )
 
+  (symbol (lib_id "Device:Transformer_1P_SS") (at 90.17 243.84 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9277186f-df56-4035-8841-9ab6cc89b1e8)
+    (property "Reference" "T?" (id 0) (at 90.1827 236.22 0))
+    (property "Value" "P: 16T S:2T on 43 or MABA-009488" (id 1) (at 90.1827 251.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 90.17 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 90.17 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 90.17 243.84 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 952a091e-e084-4b33-a2bb-654bea339c9c))
+    (pin "2" (uuid 04e64678-779a-41a6-b193-9efd97fa2460))
+    (pin "3" (uuid acaee7ff-425f-4af7-8994-ca731a63a007))
+    (pin "4" (uuid 00d5a397-c990-47b8-a1a8-eec862126a67))
+    (pin "5" (uuid 55257368-4dbe-43c2-b0f9-68ee504ca3b2))
+  )
+
   (symbol (lib_id "Device:L_Iron") (at 248.92 153.67 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 92f28f5a-680c-4bd4-83b0-0fad8e359da8)
@@ -10931,18 +10222,18 @@
     (pin "2" (uuid 3959b498-1052-4278-a9eb-337c2e4eabd5))
   )
 
-  (symbol (lib_id "Device:R") (at 339.09 62.23 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 331.47 48.26 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 98a79f63-c60c-4ca5-a6c9-502a05faec8b)
-    (property "Reference" "R?" (id 0) (at 339.09 55.88 90))
-    (property "Value" "100" (id 1) (at 339.09 58.42 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 339.09 64.008 90)
+    (property "Reference" "R?" (id 0) (at 331.47 41.91 90))
+    (property "Value" "100" (id 1) (at 331.47 44.45 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 331.47 50.038 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 339.09 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 331.47 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 339.09 62.23 0)
+    (property "Need_order" "" (id 4) (at 331.47 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f8d0d224-33d4-4877-8c65-c0421af5a162))
@@ -11029,18 +10320,18 @@
     (pin "3" (uuid 2054609f-2885-4c69-9ac5-280aca0b165b))
   )
 
-  (symbol (lib_id "Device:R") (at 275.59 80.01 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 267.97 66.04 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9d4d862f-edd7-413b-88ca-c626e42c914f)
-    (property "Reference" "R?" (id 0) (at 275.59 73.66 90))
-    (property "Value" "0" (id 1) (at 275.59 76.2 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 275.59 81.788 90)
+    (property "Reference" "R?" (id 0) (at 267.97 59.69 90))
+    (property "Value" "0" (id 1) (at 267.97 62.23 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 267.97 67.818 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 275.59 80.01 0)
+    (property "Datasheet" "~" (id 3) (at 267.97 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 275.59 80.01 0)
+    (property "Need_order" "" (id 4) (at 267.97 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1968c5d6-b539-49f5-89b9-87891578a513))
@@ -11153,37 +10444,37 @@
     (pin "2" (uuid 8175207f-800d-4574-b5e4-27518390dab1))
   )
 
-  (symbol (lib_id "power:GNDA") (at 99.06 231.14 270) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 100.33 232.41 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a5d19681-4997-4c43-958d-5df6f386710d)
-    (property "Reference" "#PWR?" (id 0) (at 92.71 231.14 0)
+    (property "Reference" "#PWR?" (id 0) (at 93.98 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 95.25 231.1399 90)
+    (property "Value" "GNDA" (id 1) (at 96.52 232.4099 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 99.06 231.14 0)
+    (property "Footprint" "" (id 2) (at 100.33 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 99.06 231.14 0)
+    (property "Datasheet" "" (id 3) (at 100.33 232.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5919cb68-dab6-4b27-93e8-16a7b501ca83))
   )
 
-  (symbol (lib_id "mpb:BAT68-04W") (at 289.56 66.04 90) (unit 1)
+  (symbol (lib_id "mpb:BAT68-04W") (at 281.94 52.07 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a62849a4-56d6-4f1a-808b-3a130d80d338)
-    (property "Reference" "D?" (id 0) (at 287.02 66.0399 90)
+    (property "Reference" "D?" (id 0) (at 279.4 52.0699 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAT68-04W" (id 1) (at 285.75 66.04 0)
+    (property "Value" "BAT68-04W" (id 1) (at 278.13 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 286.385 64.135 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 278.765 50.165 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "" (id 3) (at 289.56 66.04 0)
+    (property "Datasheet" "" (id 3) (at 281.94 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 038d61ae-f8d1-44fb-9b81-083d1e31cfcf))
@@ -11218,19 +10509,19 @@
     (pin "9" (uuid 3efe4b85-32d0-4db3-b70b-f8192f209249))
   )
 
-  (symbol (lib_id "mpb:BAT68-04W") (at 279.4 66.04 270) (unit 1)
+  (symbol (lib_id "mpb:BAT68-04W") (at 271.78 52.07 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a72ab4b4-04af-4bfa-a645-e3e9e424a971)
-    (property "Reference" "D?" (id 0) (at 281.94 66.0399 90)
+    (property "Reference" "D?" (id 0) (at 274.32 52.0699 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAT68-04W" (id 1) (at 285.75 66.04 0)
+    (property "Value" "BAT68-04W" (id 1) (at 278.13 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 282.575 67.945 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 274.955 53.975 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "" (id 3) (at 279.4 66.04 0)
+    (property "Datasheet" "" (id 3) (at 271.78 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fc460d67-48ac-45da-8819-f264f15d7926))
@@ -11238,21 +10529,21 @@
     (pin "3" (uuid 71acf4b8-2234-49a0-a154-cd6b91eb3715))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 140.97 236.22 0) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 140.97 259.08 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a77d3849-32de-42c0-a6c4-9bb6c1374ddb)
-    (property "Reference" "Y?" (id 0) (at 140.97 230.505 0))
-    (property "Value" "11.0592MHz" (id 1) (at 140.97 232.8164 0))
-    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 140.97 236.22 0)
+    (property "Reference" "Y?" (id 0) (at 140.97 253.365 0))
+    (property "Value" "11.0592MHz" (id 1) (at 140.97 255.6764 0))
+    (property "Footprint" "Crystal:Crystal_SMD_HC49-SD" (id 2) (at 140.97 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 140.97 236.22 0)
+    (property "Datasheet" "" (id 3) (at 140.97 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 140.97 236.22 0)
+    (property "MPN" "" (id 4) (at 140.97 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 140.97 236.22 0)
+    (property "Need_order" "" (id 5) (at 140.97 259.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ff7321e5-4dd4-47b9-8e5d-64cc01c0d0e9))
@@ -11715,27 +11006,6 @@
     (pin "1" (uuid 34811645-95f7-4106-899f-7e00f520f4cc))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 125.73 58.42 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid bacbdc29-905d-4755-aca3-4ae30e1b1aa5)
-    (property "Reference" "T?" (id 0) (at 125.7173 66.04 0))
-    (property "Value" "MABA-009488" (id 1) (at 125.7173 68.58 0))
-    (property "Footprint" "" (id 2) (at 125.73 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/MABA_009488_61HWCA-335640.pdf" (id 3) (at 125.73 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "MABA-009488-61HWCA" (id 4) (at 125.73 58.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2fc30696-611a-4497-bbd8-d8747aa1f5da))
-    (pin "2" (uuid 014fe1ea-3f07-41ae-a486-067e224db6c1))
-    (pin "3" (uuid eb0f2ef7-0db5-4189-be94-e7817ebe75d2))
-    (pin "4" (uuid d215c426-001b-4123-b386-13210389b666))
-    (pin "5" (uuid 22f59a53-c104-44cb-8d68-708f47fbc584))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 35.56 76.2 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bc69f267-5af2-4c78-8447-7475c36ef07a)
@@ -11938,18 +11208,18 @@
     (pin "2" (uuid 12b07c79-53a4-46db-b367-986682af072a))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 308.61 66.04 180) (unit 1)
+  (symbol (lib_id "Device:Transformer_1P_SS") (at 300.99 52.07 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c36f262a-d5d7-4c06-9442-d6dd1470d26d)
-    (property "Reference" "T?" (id 0) (at 308.61 50.8 0))
-    (property "Value" "10t tri, 43" (id 1) (at 308.61 53.34 0))
-    (property "Footprint" "" (id 2) (at 308.61 66.04 0)
+    (property "Reference" "T?" (id 0) (at 300.99 36.83 0))
+    (property "Value" "10t tri, 43" (id 1) (at 300.99 39.37 0))
+    (property "Footprint" "" (id 2) (at 300.99 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 308.61 66.04 0)
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 300.99 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "5943004901" (id 4) (at 308.61 66.04 90)
+    (property "MPN" "5943004901" (id 4) (at 300.99 52.07 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1a018bfa-5cd1-46a6-9739-e041d0057847))
@@ -12215,22 +11485,22 @@
     (pin "3" (uuid cef5ee17-9839-4164-8d7d-e647f9ddb39a))
   )
 
-  (symbol (lib_id "Device:R") (at 279.4 83.82 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 271.78 69.85 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d048f85a-e298-40d5-b96d-4dc1c1a1815f)
-    (property "Reference" "R?" (id 0) (at 281.94 82.5499 0)
+    (property "Reference" "R?" (id 0) (at 274.32 68.5799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 281.94 85.0899 0)
+    (property "Value" "DNF" (id 1) (at 274.32 71.1199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 277.622 83.82 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 270.002 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 279.4 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 271.78 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 279.4 83.82 0)
+    (property "Need_order" "" (id 4) (at 271.78 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8ab1c3b7-c0d7-4051-a72f-52e4df652ce2))
@@ -12344,25 +11614,25 @@
     (pin "2" (uuid 1ed23ce5-870f-4703-8043-56202b71a806))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 96.52 252.73 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 96.52 275.59 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d6f97ca1-d91f-4bb3-a147-15595f32008c)
-    (property "Reference" "C?" (id 0) (at 98.8568 251.5616 0)
+    (property "Reference" "C?" (id 0) (at 98.8568 274.4216 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "68pF" (id 1) (at 98.8568 253.873 0)
+    (property "Value" "68pF" (id 1) (at 98.8568 276.733 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 96.52 252.73 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 96.52 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 96.52 252.73 0)
+    (property "Datasheet" "~" (id 3) (at 96.52 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 96.52 252.73 0)
+    (property "MPN" "" (id 4) (at 96.52 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 96.52 252.73 0)
+    (property "Need_order" "" (id 5) (at 96.52 275.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e9d6b5c7-056d-4742-9938-28fc4c91e67c))
@@ -12431,26 +11701,6 @@
     (pin "2" (uuid 8309cb5b-6a4d-483b-b425-1b3e5b7d4dae))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_1S") (at 125.73 43.18 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e08abb9e-8ff8-4869-ba09-0c65d23c25fb)
-    (property "Reference" "T?" (id 0) (at 125.7427 33.02 0))
-    (property "Value" "4:1 turns ratio" (id 1) (at 125.7427 35.56 0))
-    (property "Footprint" "" (id 2) (at 125.73 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 125.73 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Description" "P: 16T S:2T on FB-43-2401" (id 4) (at 125.73 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 67b82323-5b56-463b-a893-9994028da8dc))
-    (pin "2" (uuid d1283149-176e-4caf-8c15-6a3805e926de))
-    (pin "3" (uuid b3fcdce4-5544-4123-a94b-2aa0db0dce35))
-    (pin "4" (uuid d2fad719-3d4d-4cd4-991f-25979fdb250e))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 48.26 110.49 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e16297a0-d610-49ed-9c5b-36949ff6f596)
@@ -12972,19 +12222,19 @@
     (pin "2" (uuid 0863f889-583d-4152-9a5f-15d3f0d5ec6b))
   )
 
-  (symbol (lib_id "power:GNDA") (at 248.92 60.96 270) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 241.3 46.99 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb43d9a5-77ef-4e0c-93ca-74cab7be4888)
-    (property "Reference" "#PWR?" (id 0) (at 242.57 60.96 0)
+    (property "Reference" "#PWR?" (id 0) (at 234.95 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 244.5258 61.087 0)
+    (property "Value" "GNDA" (id 1) (at 236.9058 47.117 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 248.92 60.96 0)
+    (property "Footprint" "" (id 2) (at 241.3 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 248.92 60.96 0)
+    (property "Datasheet" "" (id 3) (at 241.3 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 38cfaa5b-c2df-4546-bc9a-1ba460007dc9))
-- 
cgit v1.2.3