Calculate diplexer values

1 files changed, 762 insertions, 727 deletions

diff --git a/kicad-dart-70/baseband.kicad_sch b/kicad-dart-70/baseband.kicad_sch
index 740c0fe..3d4eb4b 100644
--- a/kicad-dart-70/baseband.kicad_sch
+++ b/kicad-dart-70/baseband.kicad_sch
@@ -631,6 +631,78 @@
         )
       )
     )
+    (symbol "Device:C_Trim" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "C" (id 0) (at 1.524 -2.032 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "C_Trim" (id 1) (at 3.048 -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" "trimmer variable capacitor" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Trimmable capacitor" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "C_Trim_0_1"
+        (polyline
+          (pts
+            (xy -2.032 -0.762)
+            (xy 2.032 -0.762)
+          )
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.032 0.762)
+            (xy 2.032 0.762)
+          )
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 2.54)
+            (xy -1.27 -2.54)
+          )
+          (stroke (width 0.3048) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 2.54)
+            (xy 0.381 3.048)
+          )
+          (stroke (width 0.3048) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 2.54)
+            (xy 2.159 2.032)
+          )
+          (stroke (width 0.3048) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "C_Trim_1_1"
+        (pin passive line (at 0 3.81 270) (length 3.048)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -3.81 90) (length 3.048)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:C_Trim_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
       (property "Reference" "C" (id 0) (at 1.524 -2.032 0)
         (effects (font (size 1.27 1.27)))
@@ -1122,230 +1194,6 @@
         )
       )
     )
-    (symbol "Device:RFShield_OnePiece" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "RFShield_OnePiece" (id 1) (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "RF EMI shielding cabinet" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "One-piece EMI RF shielding cabinet" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "RFShield_OnePiece_0_1"
-        (polyline
-          (pts
-            (xy -15.24 -5.08)
-            (xy -15.24 -2.54)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -1.27)
-            (xy -15.24 1.27)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 2.54)
-            (xy -15.24 5.08)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -12.7 7.62)
-            (xy -10.16 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -10.16 -7.62)
-            (xy -12.7 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 -7.62)
-            (xy -8.89 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -6.35 7.62)
-            (xy -8.89 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -2.54 -7.62)
-            (xy -5.08 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -2.54 7.62)
-            (xy -5.08 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.27 -7.62)
-            (xy 1.27 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 1.27 7.62)
-            (xy -1.27 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -7.62)
-            (xy 5.08 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 5.08 7.62)
-            (xy 2.54 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 6.35 -7.62)
-            (xy 8.89 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 8.89 7.62)
-            (xy 6.35 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.16 -7.62)
-            (xy 12.7 -7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 12.7 7.62)
-            (xy 10.16 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 -5.08)
-            (xy 15.24 -2.54)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 -1.27)
-            (xy 15.24 1.27)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 2.54)
-            (xy 15.24 5.08)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 6.35)
-            (xy -15.24 7.62)
-            (xy -13.97 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -13.97 -7.62)
-            (xy -15.24 -7.62)
-            (xy -15.24 -6.35)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 13.97 -7.62)
-            (xy 15.24 -7.62)
-            (xy 15.24 -6.35)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 6.35)
-            (xy 15.24 7.62)
-            (xy 13.97 7.62)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "RFShield_OnePiece_1_1"
-        (pin passive line (at 0 -10.16 90) (length 2.54)
-          (name "Shield" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:R_POT" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "RV" (id 0) (at -4.445 0 90)
         (effects (font (size 1.27 1.27)))
@@ -1586,6 +1434,81 @@
         )
       )
     )
+    (symbol "GND_1" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "GND_1" (id 1) (at 0 -3.81 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" "global power" (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)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "GND_1_0_1"
+        (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)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "GND_1_1_1"
+        (pin power_in line (at 0 0 270) (length 0) hide
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Mechanical:MountingHole_Pad" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "H" (id 0) (at 0 6.35 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "MountingHole_Pad" (id 1) (at 0 4.445 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" "mounting hole" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Mounting Hole with connection" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "MountingHole*Pad*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "MountingHole_Pad_0_1"
+        (circle (center 0 1.27) (radius 1.27)
+          (stroke (width 1.27) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "MountingHole_Pad_1_1"
+        (pin input line (at 0 -2.54 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
       (property "Reference" "U" (id 0) (at -3.81 3.175 0)
         (effects (font (size 1.27 1.27)))
@@ -2863,9 +2786,6 @@
   (junction (at 58.42 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 059f4155-bed3-4fb2-9baa-d569f31b7e5d)
   )
-  (junction (at 375.92 20.32) (diameter 0) (color 0 0 0 0)
-    (uuid 06129627-76da-431c-ac78-8a489cb0761d)
-  )
   (junction (at 320.04 101.6) (diameter 0) (color 0 0 0 0)
     (uuid 076a6a07-11fa-4191-a538-035a47a6b026)
   )
@@ -2875,9 +2795,15 @@
   (junction (at 95.25 245.11) (diameter 0) (color 0 0 0 0)
     (uuid 0964d962-846f-4609-b657-83d8fae25141)
   )
+  (junction (at 375.92 20.32) (diameter 0) (color 0 0 0 0)
+    (uuid 0e0e432b-78ea-4677-9624-cfa175a66f05)
+  )
   (junction (at 262.89 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 0e565d2a-00bb-4f20-8e2e-0f824e8d2762)
   )
+  (junction (at 356.87 127) (diameter 0) (color 0 0 0 0)
+    (uuid 0e79f50c-6749-4775-a4f9-1113788b2e6b)
+  )
   (junction (at 241.3 189.23) (diameter 0) (color 0 0 0 0)
     (uuid 0f8367d0-e4ea-40ae-8dac-4e16d60a532f)
   )
@@ -2935,15 +2861,15 @@
   (junction (at 44.45 38.1) (diameter 0) (color 0 0 0 0)
     (uuid 2792ed93-89db-4e51-99ff-281323e776eb)
   )
-  (junction (at 321.31 -54.61) (diameter 0) (color 0 0 0 0)
-    (uuid 29679519-0074-4244-8bb1-857f21221a1a)
-  )
   (junction (at 158.75 43.18) (diameter 0) (color 0 0 0 0)
     (uuid 2cd3680a-9e9d-4c97-9125-39c64a75e644)
   )
   (junction (at 270.51 198.12) (diameter 0) (color 0 0 0 0)
     (uuid 2d264e2f-7e31-4a17-86c5-13a68ab3ff7e)
   )
+  (junction (at 363.22 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 2fd14c3b-7e81-4330-b4b6-7d3b5d88fd5c)
+  )
   (junction (at 393.7 115.57) (diameter 0) (color 0 0 0 0)
     (uuid 2fdc7923-56aa-4f0e-b559-e1b2e79c3c8f)
   )
@@ -2965,6 +2891,9 @@
   (junction (at 383.54 165.1) (diameter 0) (color 0 0 0 0)
     (uuid 3365c11b-b4a5-418d-85ee-41028926f18a)
   )
+  (junction (at 351.79 30.48) (diameter 0) (color 0 0 0 0)
+    (uuid 3b4c9779-bcad-4732-8142-8c3ab8d0419f)
+  )
   (junction (at 173.99 35.56) (diameter 0) (color 0 0 0 0)
     (uuid 3bd6009a-f48b-4c66-92de-4d24549b4c7d)
   )
@@ -2977,21 +2906,33 @@
   (junction (at 403.86 120.65) (diameter 0) (color 0 0 0 0)
     (uuid 3f6ba890-8616-4e68-b9d0-3d4eacc2e5c7)
   )
+  (junction (at 375.92 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 3fcecab3-b47b-4a8c-9fb9-b323af94bc6b)
+  )
   (junction (at 173.99 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 43c88063-044a-47b7-b010-f3fb76152eec)
   )
-  (junction (at 372.11 115.57) (diameter 0) (color 0 0 0 0)
+  (junction (at 375.92 102.87) (diameter 0) (color 0 0 0 0)
     (uuid 446196fa-4af3-4fe1-9348-f02489c61276)
   )
   (junction (at 199.39 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 460147d8-e4b6-4910-88e9-07d1ddd6c2df)
   )
-  (junction (at 222.25 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 219.71 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 485f8372-6f58-431e-9419-bfc90ad67732)
   )
+  (junction (at 364.49 30.48) (diameter 0) (color 0 0 0 0)
+    (uuid 4b3ba67b-606d-4750-abb9-54a01fd7bc1a)
+  )
   (junction (at 212.09 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 4b982f8b-ca29-4ebf-88fc-8a50b24e0802)
   )
+  (junction (at 359.41 30.48) (diameter 0) (color 0 0 0 0)
+    (uuid 4bcbab50-174d-4a4b-8660-c13a99f4d953)
+  )
+  (junction (at 375.92 29.21) (diameter 0) (color 0 0 0 0)
+    (uuid 4dbafe87-53e2-4b1b-b9d1-f029995a0c51)
+  )
   (junction (at 91.44 50.8) (diameter 0) (color 0 0 0 0)
     (uuid 4f100da6-d6f9-4b77-90f1-fda986c2ed73)
   )
@@ -3001,9 +2942,6 @@
   (junction (at 184.15 213.36) (diameter 0) (color 0 0 0 0)
     (uuid 510aabe6-d19e-45d2-9ee4-74f6d2e6df89)
   )
-  (junction (at 361.95 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid 55c2ac3f-8f3b-4f78-9b14-388c97827d8c)
-  )
   (junction (at 393.7 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 56e3e10b-0165-4e27-9816-f40b5bb7e426)
   )
@@ -3022,9 +2960,6 @@
   (junction (at 275.59 124.46) (diameter 0) (color 0 0 0 0)
     (uuid 5fc44bfc-3a32-42f5-89ff-303d655beeb1)
   )
-  (junction (at 351.79 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid 5fe39347-c8a3-40ce-ace1-a055bc364f38)
-  )
   (junction (at 198.12 223.52) (diameter 0) (color 0 0 0 0)
     (uuid 611c0051-64b3-4ff6-b51a-6ea814324060)
   )
@@ -3037,9 +2972,6 @@
   (junction (at 138.43 39.37) (diameter 0) (color 0 0 0 0)
     (uuid 67d87795-1d4f-4f21-9afa-f7da30e8b867)
   )
-  (junction (at 349.25 104.14) (diameter 0) (color 0 0 0 0)
-    (uuid 6b3de47f-b1a0-458a-9a8a-52cfeead82b0)
-  )
   (junction (at 342.9 86.36) (diameter 0) (color 0 0 0 0)
     (uuid 6bdd7ca9-a767-4e33-bf37-498b319fce63)
   )
@@ -3073,18 +3005,18 @@
   (junction (at 205.74 171.45) (diameter 0) (color 0 0 0 0)
     (uuid 89924c9d-894c-4783-bb98-91fe4fffc426)
   )
-  (junction (at 359.41 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 363.22 100.33) (diameter 0) (color 0 0 0 0)
     (uuid 89a0992d-b4b4-4a98-9018-0c3e3ac7c4ed)
   )
   (junction (at 403.86 91.44) (diameter 0) (color 0 0 0 0)
     (uuid 8a030abd-885a-4b15-b74a-b44dc2b6c7d7)
   )
-  (junction (at 375.92 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid 8a0d9941-07e6-4643-8f6b-bd2fdd5d5ae4)
-  )
   (junction (at 334.01 78.74) (diameter 0) (color 0 0 0 0)
     (uuid 8cad30c6-cd21-4b04-8aa8-5dfd9876668a)
   )
+  (junction (at 370.84 40.64) (diameter 0) (color 0 0 0 0)
+    (uuid 8d45f61e-b48a-4d9a-9705-81179d1cee29)
+  )
   (junction (at 92.71 255.27) (diameter 0) (color 0 0 0 0)
     (uuid 8d612602-5cc8-45dd-a943-2a29be4b9ede)
   )
@@ -3130,10 +3062,10 @@
   (junction (at 254 80.01) (diameter 0) (color 0 0 0 0)
     (uuid 99c68e22-79ac-4df3-82ed-69d5274feb54)
   )
-  (junction (at 359.41 118.11) (diameter 0) (color 0 0 0 0)
+  (junction (at 363.22 113.03) (diameter 0) (color 0 0 0 0)
     (uuid 9a438e91-12f1-4003-9587-51635f0ae695)
   )
-  (junction (at 222.25 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 219.71 80.01) (diameter 0) (color 0 0 0 0)
     (uuid 9cae7022-94ae-4784-b773-30ffde5822a7)
   )
   (junction (at 102.87 73.66) (diameter 0) (color 0 0 0 0)
@@ -3202,7 +3134,7 @@
   (junction (at 154.94 181.61) (diameter 0) (color 0 0 0 0)
     (uuid b52e2ac1-1ad4-4299-a3b7-5950aeda9b09)
   )
-  (junction (at 222.25 67.31) (diameter 0) (color 0 0 0 0)
+  (junction (at 219.71 67.31) (diameter 0) (color 0 0 0 0)
     (uuid b55942a4-2e67-4c91-a2e2-17d287af1b39)
   )
   (junction (at 58.42 227.33) (diameter 0) (color 0 0 0 0)
@@ -3256,6 +3188,9 @@
   (junction (at 241.3 187.96) (diameter 0) (color 0 0 0 0)
     (uuid cf4a7a0f-4b62-4a14-8810-1f9be9bb8bca)
   )
+  (junction (at 375.92 40.64) (diameter 0) (color 0 0 0 0)
+    (uuid cfd26f0b-c959-40e8-8a7e-48204bb5c64f)
+  )
   (junction (at 224.79 143.51) (diameter 0) (color 0 0 0 0)
     (uuid d3e01bdf-5c14-407f-80a1-1d934fc04fab)
   )
@@ -3313,6 +3248,9 @@
   (junction (at 74.93 137.16) (diameter 0) (color 0 0 0 0)
     (uuid e8558fbd-ea42-43a6-966a-7bd304bdfaad)
   )
+  (junction (at 353.06 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid e8822f44-e7ca-47f3-a9bc-951244c889e7)
+  )
   (junction (at 36.83 143.51) (diameter 0) (color 0 0 0 0)
     (uuid eac540a2-0555-4530-b9cb-9b037a65c0a7)
   )
@@ -3322,6 +3260,9 @@
   (junction (at 137.16 187.96) (diameter 0) (color 0 0 0 0)
     (uuid ecba702e-9fb5-4bd7-9b08-5197492ec54b)
   )
+  (junction (at 349.25 127) (diameter 0) (color 0 0 0 0)
+    (uuid ef4c798c-4721-49f1-8016-e362a6672715)
+  )
   (junction (at 398.78 165.1) (diameter 0) (color 0 0 0 0)
     (uuid efac21da-3f93-4ae4-bab8-dbdec293c35e)
   )
@@ -3334,11 +3275,8 @@
   (junction (at 154.94 171.45) (diameter 0) (color 0 0 0 0)
     (uuid f1a9e2a2-6347-4852-b335-cf8402c433a4)
   )
-  (junction (at 318.77 -83.82) (diameter 0) (color 0 0 0 0)
-    (uuid f3285ed9-855d-4b3c-9145-ed9dbda7a1d9)
-  )
-  (junction (at 306.07 -54.61) (diameter 0) (color 0 0 0 0)
-    (uuid f9728ce1-58db-4b51-bb92-9b665142c745)
+  (junction (at 353.06 116.84) (diameter 0) (color 0 0 0 0)
+    (uuid f22dadd7-4a1b-4449-b981-cbbeced9fbc5)
   )
   (junction (at 184.15 185.42) (diameter 0) (color 0 0 0 0)
     (uuid fb5d1a59-18d1-49ea-b504-10e76cce8897)
@@ -3346,9 +3284,6 @@
   (junction (at 123.19 190.5) (diameter 0) (color 0 0 0 0)
     (uuid fbe71f6a-7e5a-41f1-9e6e-b2e94d49a3bc)
   )
-  (junction (at 349.25 127) (diameter 0) (color 0 0 0 0)
-    (uuid fc53697a-5adc-4172-b2ba-694af73fcfdd)
-  )
   (junction (at 29.21 63.5) (diameter 0) (color 0 0 0 0)
     (uuid fe2b05f5-675b-44d0-956c-c5829b7c692a)
   )
@@ -3380,15 +3315,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0113fe75-9787-49bd-865f-03242ce2a366)
   )
-  (wire (pts (xy 222.25 57.15) (xy 222.25 54.61))
+  (wire (pts (xy 219.71 57.15) (xy 219.71 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0125f083-fa2b-4a11-85be-7853b609b001)
   )
+  (wire (pts (xy 359.41 30.48) (xy 359.41 35.56))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 01c67c04-8ed4-481b-b382-ac69e0a55001)
+  )
   (wire (pts (xy 68.58 66.04) (xy 64.77 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 01caafb3-af8a-4642-870c-c290b286d040)
   )
-  (wire (pts (xy 222.25 74.93) (xy 222.25 80.01))
+  (wire (pts (xy 219.71 74.93) (xy 219.71 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 01cceb30-c85f-4510-b324-8d17341fc730)
   )
@@ -3448,10 +3387,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04ef368b-f4e9-48da-956c-ee93cb3d01e8)
   )
+  (wire (pts (xy 363.22 106.68) (xy 363.22 113.03))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 05ddadd4-94df-4d6a-b500-ff320675ba33)
+  )
   (wire (pts (xy 241.3 227.33) (xy 241.3 236.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 066671d9-1fdf-4a05-a7e7-cadb7d44b89f)
   )
+  (wire (pts (xy 356.87 124.46) (xy 356.87 127))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 06fedb5b-65dd-4aa0-9e2d-b04e5a505f26)
+  )
   (wire (pts (xy 208.28 124.46) (xy 212.09 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 082d865b-0a4e-49c3-b18b-be47fd4a465a)
@@ -3476,10 +3423,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09aa0d32-f4dc-42fd-a756-e1229737bd34)
   )
-  (wire (pts (xy 361.95 35.56) (xy 361.95 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 09f01836-52b7-4cc9-b245-1b1e36d31834)
-  )
   (wire (pts (xy 289.56 236.22) (xy 289.56 241.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0a0c053c-54e0-4f14-b909-036d0c5fbf08)
@@ -3496,7 +3439,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0b5e9f79-a50b-4078-b2be-eff1d45ab7fc)
   )
-  (wire (pts (xy 222.25 80.01) (xy 222.25 85.09))
+  (wire (pts (xy 219.71 80.01) (xy 219.71 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0c3bb475-57a3-4465-801b-1823c9a733cc)
   )
@@ -3516,18 +3459,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 100847e3-630c-4c13-ba45-180e92370805)
   )
-  (wire (pts (xy 313.69 -36.83) (xy 327.66 -36.83))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 10bd27b2-1d07-444a-9776-fc259e0db345)
-  )
   (wire (pts (xy 318.77 71.12) (xy 318.77 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 10ef0d40-b427-4fac-bff7-e8ca2d279fd2)
   )
-  (wire (pts (xy 393.7 35.56) (xy 375.92 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 110d1e6b-ad69-49f9-883c-0dd74a05fd74)
-  )
   (wire (pts (xy 166.37 66.04) (xy 172.72 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11ac1ac8-72b6-43ed-915e-50f87561daf8)
@@ -3536,10 +3471,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 12340fb8-cd9c-4069-beec-13d4d2ea0d99)
   )
-  (wire (pts (xy 361.95 36.83) (xy 361.95 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 127f70da-b001-4621-a4ee-78ee7182bcde)
-  )
   (polyline (pts (xy 307.34 54.61) (xy 321.31 54.61))
     (stroke (width 1) (type solid) (color 0 0 0 0))
     (uuid 1281d63b-9c8c-4454-9b2d-0bbbc27e2ae7)
@@ -3589,7 +3520,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 189610aa-2967-4418-8b8b-b36bdf6bc60b)
   )
-  (wire (pts (xy 372.11 113.03) (xy 372.11 115.57))
+  (wire (pts (xy 375.92 100.33) (xy 375.92 102.87))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 19028db1-670b-4d84-9d20-5aa2f8585dd7)
   )
@@ -3617,6 +3548,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a9f0d73-6986-450b-8da5-dca8d718cd0d)
   )
+  (wire (pts (xy 375.92 20.32) (xy 386.08 20.32))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1b89864d-e042-4259-99ab-c96136a33a11)
+  )
   (wire (pts (xy 359.41 67.31) (xy 359.41 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1c0378fb-8fa4-4942-8a64-86b9252ef636)
@@ -3625,7 +3560,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d8cbdb8-b0d5-4f06-84c8-05770b7e9555)
   )
-  (wire (pts (xy 222.25 59.69) (xy 222.25 57.15))
+  (wire (pts (xy 219.71 59.69) (xy 219.71 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1dbe419a-f71e-4ab5-9a49-e58e75747fdf)
   )
@@ -3637,7 +3572,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1ddbded3-4d65-49ba-8123-18c72e4b7f4a)
   )
-  (wire (pts (xy 359.41 118.11) (xy 359.41 119.38))
+  (wire (pts (xy 363.22 113.03) (xy 363.22 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1e2c0cdd-08a6-4586-b370-3ffc74205845)
   )
@@ -3681,10 +3616,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 233c88a4-9a5e-42af-96fb-5079a0c4ddfe)
   )
-  (wire (pts (xy 318.77 -63.5) (xy 321.31 -63.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 24e4c8b7-7963-4a14-b3e0-4b86218811d3)
-  )
   (wire (pts (xy 241.3 189.23) (xy 241.3 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25347fbb-8744-4d15-9949-de9866144f81)
@@ -3697,18 +3628,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25b40549-5004-4a9f-8c83-45a4561f2c44)
   )
-  (wire (pts (xy 313.69 -34.29) (xy 313.69 -36.83))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 261eb6dc-d5dd-4e47-8bce-04c77069621a)
-  )
   (wire (pts (xy 39.37 213.36) (xy 50.8 213.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 268a679e-e023-47f5-8a31-2516b1c23479)
   )
-  (wire (pts (xy 214.63 67.31) (xy 222.25 67.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 275568d0-09db-49c2-9144-c338cf90d66a)
-  )
   (wire (pts (xy 295.91 173.99) (xy 295.91 177.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 27937394-9bb7-48f6-a154-02c32eca1c67)
@@ -3773,9 +3696,13 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ec9be40-1d5a-4e2d-8a4d-4be2d3c079d5)
   )
-  (wire (pts (xy 306.07 -54.61) (xy 306.07 -63.5))
+  (wire (pts (xy 353.06 86.36) (xy 353.06 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 306c58e8-628e-47f3-98f7-56966b54150f)
+    (uuid 2f3f2305-6e67-4103-9727-21f03965c347)
+  )
+  (wire (pts (xy 214.63 67.31) (xy 219.71 67.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3026ca22-9079-411a-bec8-e95daa0137af)
   )
   (wire (pts (xy 125.73 214.63) (xy 123.19 214.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -3829,10 +3756,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3586fadc-dfb0-445d-9e9e-609ee49ba8a3)
   )
-  (wire (pts (xy 349.25 127) (xy 359.41 127))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 35dbe510-347f-4115-945a-275dbc9544a8)
-  )
   (wire (pts (xy 27.94 160.02) (xy 27.94 154.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 35e60fa0-27cf-4d0e-8bab-b364400c08c0)
@@ -3857,7 +3780,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37776474-3e55-452d-b61d-56f6c437c0b7)
   )
-  (wire (pts (xy 364.49 118.11) (xy 359.41 118.11))
+  (wire (pts (xy 368.3 113.03) (xy 363.22 113.03))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37c4ff09-2526-492b-a9f8-7ea7ff67af23)
   )
@@ -3895,7 +3818,7 @@
     (uuid 3ae1ad84-1d31-4d2b-b989-ca9af6058aea)
   )
 
-  (wire (pts (xy 393.7 59.69) (xy 393.7 35.56))
+  (wire (pts (xy 393.7 59.69) (xy 393.7 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3b27dc08-2c00-4501-9b7e-e1fc9c4c1450)
   )
@@ -3952,10 +3875,6 @@
     (uuid 4163deab-1cd6-41dd-a3a6-4003a316c140)
   )
 
-  (wire (pts (xy 308.61 -13.97) (xy 298.45 -13.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 418baf25-2131-4704-af70-d4ecbb8bbba9)
-  )
   (wire (pts (xy 49.53 161.29) (xy 43.18 161.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4208e41d-1d0a-40b9-bf94-fcbeb6562f9d)
@@ -3985,10 +3904,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 444b90a0-e12f-4604-8031-264a2e3dcb20)
   )
-  (wire (pts (xy 369.57 35.56) (xy 375.92 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 446b42d3-2017-4098-9899-14a23b103535)
-  )
   (wire (pts (xy 241.3 219.71) (xy 231.14 219.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44df90bf-029f-4262-a166-22df8e216390)
@@ -4026,14 +3941,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 46da1e60-4761-4966-96b0-d563aff527c6)
   )
-  (wire (pts (xy 213.36 57.15) (xy 222.25 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 47076e24-9441-4900-9545-cf8ad7495150)
-  )
-  (wire (pts (xy 321.31 -44.45) (xy 321.31 -54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4797a9a5-a5db-453d-be34-c58f5e708967)
-  )
   (wire (pts (xy 255.27 80.01) (xy 254 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 479fe35f-e09c-4372-8e15-6784a7e3fd2e)
@@ -4047,6 +3954,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 47e8fba7-36e4-45b9-a8af-75005a86d254)
   )
+  (wire (pts (xy 353.06 116.84) (xy 356.87 116.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 492c5c5d-50ff-4f53-8bfe-dbeae65bd117)
+  )
   (wire (pts (xy 231.14 220.98) (xy 231.14 219.71))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4931cfe6-a57f-424e-bedb-abc0697ca70b)
@@ -4124,10 +4035,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 524b0bbc-ded0-4ac4-9d45-7316ae611d2e)
   )
-  (wire (pts (xy 306.07 -44.45) (xy 306.07 -54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 535b425e-2ead-4101-8ded-6dd7d2c9d352)
-  )
   (wire (pts (xy 205.74 171.45) (xy 198.12 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53a7277a-bd72-4503-81ee-dc81381da923)
@@ -4140,7 +4047,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 54b8142c-865d-46b7-bd41-9094b627d1ea)
   )
-  (wire (pts (xy 231.14 67.31) (xy 222.25 67.31))
+  (wire (pts (xy 231.14 67.31) (xy 219.71 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5515a45d-852f-41ee-ad6f-db22f355894a)
   )
@@ -4156,18 +4063,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 56bbedad-6259-4443-b321-0ffa1f89c336)
   )
-  (wire (pts (xy 308.61 -34.29) (xy 303.53 -34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 57017bb9-5d41-4b31-9172-29f647f38db6)
-  )
   (wire (pts (xy 318.77 71.12) (xy 306.07 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58bd414d-1da5-4de0-bedc-7c4d6ecbc663)
   )
-  (wire (pts (xy 351.79 34.29) (xy 351.79 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 59352dbf-ed93-4a71-8e11-dafed012fa72)
-  )
   (wire (pts (xy 212.09 143.51) (xy 224.79 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 59ee13a4-660e-47e2-a73a-01cfe11439e9)
@@ -4258,6 +4157,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6239967a-77bd-4ec9-89cd-e04efd8dbe26)
   )
+  (wire (pts (xy 351.79 26.67) (xy 351.79 30.48))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 623f1621-060f-45f6-88bd-561c5af2acb1)
+  )
   (wire (pts (xy 392.43 139.7) (xy 398.78 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 625c04a1-c241-42db-b68b-0fcebe1cf05b)
@@ -4312,11 +4215,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6816c017-2ccb-479e-9f22-54b316f5230c)
   )
-  (wire (pts (xy 349.25 104.14) (xy 359.41 104.14))
+  (wire (pts (xy 353.06 91.44) (xy 363.22 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68387c91-3b34-4a1b-8acb-8afbe6a83281)
   )
-  (polyline (pts (xy 218.44 41.91) (xy 217.17 43.18))
+  (polyline (pts (xy 217.17 41.91) (xy 215.9 43.18))
     (stroke (width 1) (type default) (color 0 0 0 0))
     (uuid 6843e6cd-4b70-4863-8ce7-e20d66a6c467)
   )
@@ -4337,9 +4240,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a3aff19-5e5c-466c-80b5-82ab994aaee1)
   )
-  (wire (pts (xy 313.69 -59.69) (xy 303.53 -59.69))
+  (wire (pts (xy 375.92 106.68) (xy 375.92 113.03))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c86afcb-7177-47f2-8064-ed3be1ff755e)
+    (uuid 6b19a8a4-056d-44ec-a4ad-c581782c0047)
   )
   (wire (pts (xy 198.12 171.45) (xy 184.15 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -4394,7 +4297,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7287233a-8bee-4cb7-972f-e88f9e8c9c05)
   )
-  (wire (pts (xy 220.98 80.01) (xy 222.25 80.01))
+  (wire (pts (xy 218.44 80.01) (xy 219.71 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 729c2869-ff1d-44e5-93c5-e775e05584de)
   )
@@ -4402,10 +4305,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7379b354-13a7-4d74-9b31-58f89692512f)
   )
-  (wire (pts (xy 306.07 -63.5) (xy 308.61 -63.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 73b2d4b4-d67b-4a9a-a863-3e4af4b8fd5f)
-  )
   (wire (pts (xy 299.72 198.12) (xy 299.72 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 742d47be-db3c-4e05-9d4c-991a4295c5b5)
@@ -4431,6 +4330,10 @@
     (uuid 77f63278-dd6a-44ad-be59-60e72c5a32f1)
   )
 
+  (wire (pts (xy 353.06 91.44) (xy 353.06 93.98))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 781ea648-598d-44f0-aa54-4364a70724df)
+  )
   (wire (pts (xy 208.28 199.39) (xy 176.53 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78e23870-9b05-480d-b825-f65c8269c89f)
@@ -4455,7 +4358,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7abfe5b2-5304-4361-be73-011f6c471ef4)
   )
-  (wire (pts (xy 364.49 113.03) (xy 359.41 113.03))
+  (wire (pts (xy 368.3 100.33) (xy 363.22 100.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b2dc696-1a10-4454-b7dd-774c3af412d0)
   )
@@ -4479,6 +4382,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c17edd0-6f2d-4f65-8125-a2702fda17e8)
   )
+  (wire (pts (xy 363.22 127) (xy 363.22 121.92))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7c52eaf8-65f7-463d-9b9d-7f6038bc88c0)
+  )
+  (wire (pts (xy 364.49 40.64) (xy 370.84 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7c874f62-f5e6-4d5f-978f-065cfe4bb9ec)
+  )
   (wire (pts (xy 199.39 143.51) (xy 212.09 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7ce4aab5-8271-4432-a4b1-bff168293b45)
@@ -4511,14 +4422,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 804bda20-75d0-4292-80cc-32a55cc27457)
   )
-  (wire (pts (xy 353.06 36.83) (xy 351.79 36.83))
+  (wire (pts (xy 370.84 36.83) (xy 370.84 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 804f6e34-fd20-4ac3-a108-9649a90f2729)
+    (uuid 8099263a-4071-4281-8d6a-c7c601345412)
   )
   (wire (pts (xy 402.59 115.57) (xy 403.86 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 80a634db-6f15-407c-b015-3fccdf1c686a)
   )
+  (wire (pts (xy 375.92 36.83) (xy 375.92 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 81274a9a-da60-4e77-8c92-53a04e82c492)
+  )
   (wire (pts (xy 102.87 170.18) (xy 102.87 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 82d04e2c-faa4-43b4-b2fd-16fc5530faff)
@@ -4544,7 +4459,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83e0c458-9010-4b84-bde5-090a7ffeba0e)
   )
-  (wire (pts (xy 359.41 113.03) (xy 359.41 118.11))
+  (wire (pts (xy 363.22 100.33) (xy 363.22 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83f08c81-5cef-41a8-8502-7fc3c0d3aa76)
   )
@@ -4556,6 +4471,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 851a0bc8-0ae2-4270-a2d7-cf38111e6e8f)
   )
+  (wire (pts (xy 375.92 40.64) (xy 393.7 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 855ecfab-6eeb-452a-bb3d-132d1021714e)
+  )
   (wire (pts (xy 334.01 101.6) (xy 326.39 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 85dfa9a2-7ff0-48e2-b03b-23a3c846dffd)
@@ -4568,7 +4487,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 866a53b9-c687-4a0b-9a2f-416f80096770)
   )
-  (wire (pts (xy 222.25 44.45) (xy 222.25 46.99))
+  (wire (pts (xy 219.71 44.45) (xy 219.71 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 86f612ac-8962-47ae-ada3-d5b970b90de3)
   )
@@ -4580,6 +4499,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 882d0059-3810-4018-b73c-6bfb52aa389f)
   )
+  (wire (pts (xy 349.25 86.36) (xy 353.06 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 88b2bd1b-ade4-40dd-8aae-64d132979df7)
+  )
   (wire (pts (xy 102.87 105.41) (xy 19.05 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 88de36fd-0d27-4ecc-9237-fbf499f2fe6a)
@@ -4588,10 +4511,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 894a8cae-6944-4565-b545-9036ece0c2e3)
   )
-  (wire (pts (xy 375.92 33.02) (xy 375.92 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8a19ead7-5ab4-4c3f-8cb9-0e8dbba703b4)
-  )
   (wire (pts (xy 205.74 193.04) (xy 205.74 201.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8a27e5e0-7095-4086-a01a-ed8a8ab2ad0d)
@@ -4628,10 +4547,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e5a3783-142f-42f6-a215-d0f81a05c5c0)
   )
+  (wire (pts (xy 359.41 30.48) (xy 364.49 30.48))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8ef31f72-35c6-4ea4-9bda-78263b0371ea)
+  )
   (wire (pts (xy 95.25 255.27) (xy 95.25 257.81))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8efdff8a-2eae-4206-a9e2-d66dbfaf890f)
   )
+  (wire (pts (xy 350.52 30.48) (xy 351.79 30.48))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8f03de45-ea8f-40af-bea3-ecd72c5f909b)
+  )
   (wire (pts (xy 44.45 48.26) (xy 44.45 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90207e9d-650a-4c45-b7d5-e506cc85537d)
@@ -4640,7 +4567,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90744d5e-9dab-4c38-a84a-09b4f88dc58e)
   )
-  (wire (pts (xy 372.11 115.57) (xy 372.11 118.11))
+  (wire (pts (xy 375.92 102.87) (xy 375.92 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90866162-ba8b-4466-8263-4e9b480069bc)
   )
@@ -4652,10 +4579,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 921b0cee-85ac-4d59-aedc-fe5529da120b)
   )
-  (wire (pts (xy 349.25 86.36) (xy 349.25 104.14))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 92823fb9-aeeb-4f64-9d8e-3910741885e1)
-  )
   (wire (pts (xy 102.87 53.34) (xy 100.33 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92d590e1-9ed3-4c91-adf0-bdc2b6b37331)
@@ -4709,10 +4632,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96d42e3c-5260-4163-9ecf-dbe1aba9ed59)
   )
-  (wire (pts (xy 375.92 20.32) (xy 373.38 20.32))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96f87c2b-4767-4230-807a-a6c719cc34b0)
-  )
   (wire (pts (xy 190.5 224.79) (xy 190.5 223.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 986467b0-d1bf-47a1-a37e-86028f8e433e)
@@ -4733,6 +4652,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9950c7f4-d553-41c5-a0db-b31ca697bc49)
   )
+  (wire (pts (xy 370.84 29.21) (xy 375.92 29.21))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 997a0031-0a18-44f7-b232-a6e00b35208d)
+  )
   (wire (pts (xy 299.72 180.34) (xy 299.72 177.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9a6b9e36-e151-481c-a609-5ce0a828c16e)
@@ -4798,7 +4721,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9fd9c729-afbc-4d06-ad60-5dc91e23575e)
   )
-  (polyline (pts (xy 204.47 41.91) (xy 218.44 41.91))
+  (polyline (pts (xy 203.2 41.91) (xy 217.17 41.91))
     (stroke (width 1) (type solid) (color 0 0 0 0))
     (uuid a05f99e6-6159-4f34-a0c9-6e046bc4f093)
   )
@@ -4891,10 +4814,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a6187c22-3622-4a1a-a49a-b21e96986f96)
   )
-  (wire (pts (xy 321.31 -63.5) (xy 321.31 -54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a61d144c-677f-4293-ba9f-55e94b5186d6)
-  )
   (wire (pts (xy 59.69 241.3) (xy 59.69 247.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a648e3ca-3bf9-4b8e-a5d4-83d111cd670f)
@@ -4943,10 +4862,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab3a6108-d780-4153-aac5-d291908bed49)
   )
-  (wire (pts (xy 318.77 -83.82) (xy 318.77 -90.17))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ab3efb7a-dd19-4e73-a69b-e9444687bdfc)
-  )
   (polyline (pts (xy 172.72 106.68) (xy 172.72 120.65))
     (stroke (width 1) (type solid) (color 0 0 0 0))
     (uuid ab8edd54-d96e-4f57-9eb9-c30071b28a90)
@@ -4973,6 +4888,10 @@
     (uuid ae84e68e-1211-4e7a-a6ca-9098bfe0f6c2)
   )
 
+  (wire (pts (xy 370.84 40.64) (xy 375.92 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ae8cce89-114b-45da-81a3-7be28dcdf070)
+  )
   (wire (pts (xy 96.52 278.13) (xy 95.25 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid afe1bfff-a9ef-40bc-9868-5d0708d986a5)
@@ -4989,6 +4908,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b20fb198-6b0b-4cab-9ba8-ea9b46e8088f)
   )
+  (wire (pts (xy 349.25 124.46) (xy 349.25 127))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b25d7573-73ad-4699-8655-37793e5846f9)
+  )
   (wire (pts (xy 270.51 195.58) (xy 270.51 198.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b29d86b2-0366-46e7-9a91-8c4a1941caeb)
@@ -5025,6 +4948,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b6950d03-8cf8-49d4-a5ca-91b4fdfa9229)
   )
+  (wire (pts (xy 213.36 57.15) (xy 219.71 57.15))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b6a01745-9626-4bfa-b656-a374d1035cd7)
+  )
   (polyline (pts (xy 321.31 54.61) (xy 320.04 55.88))
     (stroke (width 1) (type default) (color 0 0 0 0))
     (uuid b736073d-bfce-49ff-9437-ca43b6db7072)
@@ -5071,6 +4998,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b974ed7e-d581-4d99-941f-e2d2b55029a9)
   )
+  (wire (pts (xy 349.25 116.84) (xy 353.06 116.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b9829a0b-0f06-45f6-aed1-e9038101e3a7)
+  )
   (wire (pts (xy 304.8 187.96) (xy 299.72 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b9ce8e3e-e1ed-40cd-a087-5014bb2860e2)
@@ -5079,6 +5010,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ba3f68df-a80d-4363-9b28-2b49507e87bd)
   )
+  (wire (pts (xy 364.49 20.32) (xy 375.92 20.32))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bab99b91-cfb3-4720-9419-c96e388d419b)
+  )
   (wire (pts (xy 309.88 215.9) (xy 309.88 214.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bba259b9-8171-4213-ab6c-450bc877397a)
@@ -5104,6 +5039,10 @@
     (uuid bcdeb8cf-55eb-4020-a3d2-a39303a353bc)
   )
 
+  (wire (pts (xy 364.49 30.48) (xy 364.49 33.02))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bd4e3bac-fca8-4434-bbda-bbeae49cf429)
+  )
   (wire (pts (xy 176.53 199.39) (xy 176.53 193.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bd7a60ba-7561-4c78-be84-2d31ea3c9a90)
@@ -5128,14 +5067,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be5e7ff7-e109-4269-b1f2-5ea5b2205234)
   )
+  (wire (pts (xy 356.87 127) (xy 363.22 127))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bea2ead7-f49b-46f1-ab04-2bc0cae042a5)
+  )
   (polyline (pts (xy 379.73 16.51) (xy 346.71 16.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bf723b4d-3c4c-4195-b8bf-3bc4129dadee)
   )
 
-  (wire (pts (xy 318.77 -34.29) (xy 318.77 -39.37))
+  (wire (pts (xy 364.49 27.94) (xy 364.49 30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bfeebcc7-cbd3-4df8-85ba-0ba757e2fcef)
+    (uuid c07eb734-0859-4bb5-8935-50594a6c3c15)
   )
   (wire (pts (xy 43.18 236.22) (xy 43.18 255.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5145,10 +5088,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c0b9d717-3dee-4666-aa80-b3b3cbf24bb6)
   )
-  (wire (pts (xy 308.61 -83.82) (xy 308.61 -90.17))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c0ba8559-eb09-42c4-8da3-665532c4020b)
-  )
   (wire (pts (xy 224.79 133.35) (xy 228.6 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c10ace36-a93c-4c08-ac75-059ef9e1f71c)
@@ -5246,10 +5185,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd8c6c53-febf-40c1-af77-5373add0fde7)
   )
-  (wire (pts (xy 349.25 107.95) (xy 349.25 104.14))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cdab97cc-768a-4e85-a400-f5ffe65dea3b)
-  )
   (wire (pts (xy 398.78 160.02) (xy 398.78 165.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ce5125fa-438c-4a11-b617-b615d2b56863)
@@ -5283,7 +5218,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d08f7845-567e-4830-81c2-a7dd828ea649)
   )
-  (wire (pts (xy 175.26 85.09) (xy 222.25 85.09))
+  (wire (pts (xy 175.26 85.09) (xy 219.71 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d1015b8c-54c3-4cf9-a2d1-23b2038ae0aa)
   )
@@ -5327,11 +5262,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d6892143-e931-4761-a8f6-c00e31056a27)
   )
-  (polyline (pts (xy 218.44 41.91) (xy 217.17 40.64))
+  (polyline (pts (xy 217.17 41.91) (xy 215.9 40.64))
     (stroke (width 1) (type solid) (color 0 0 0 0))
     (uuid d69e9455-6b6c-482c-a277-02a84709eb78)
   )
 
+  (wire (pts (xy 363.22 106.68) (xy 368.3 106.68))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d7131781-bad9-4093-a92c-5562971610fa)
+  )
   (wire (pts (xy 27.94 228.6) (xy 22.86 228.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d7de2887-c7b2-4bb7-a339-632f4f906224)
@@ -5340,9 +5279,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d888ad9c-815d-4b52-9156-d6266aebe4bf)
   )
-  (wire (pts (xy 353.06 34.29) (xy 351.79 34.29))
+  (wire (pts (xy 375.92 20.32) (xy 375.92 21.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d8ffaca0-058a-4fb0-8d3b-29fc213c8339)
+    (uuid d8c06751-5fb9-4c8d-b560-9fae7db66c27)
   )
   (wire (pts (xy 69.85 260.35) (xy 77.47 260.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5353,7 +5292,7 @@
     (uuid db6760ad-98b1-47c1-a6dc-53af1beea1f8)
   )
 
-  (wire (pts (xy 359.41 113.03) (xy 359.41 111.76))
+  (wire (pts (xy 363.22 100.33) (xy 363.22 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dde681de-40e0-4b21-8fc6-0c73fdee3c0f)
   )
@@ -5361,10 +5300,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid de255002-ddae-41e6-a71c-d3a3b7c1cd43)
   )
-  (wire (pts (xy 360.68 34.29) (xy 361.95 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid de519033-9f41-4d62-a85c-87437410f84f)
-  )
   (wire (pts (xy 243.84 67.31) (xy 254 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid deb7ea1e-e822-4b07-880b-4d64d5993dee)
@@ -5381,10 +5316,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e025178a-6897-4647-9c5b-528472a8f76e)
   )
-  (wire (pts (xy 375.92 20.32) (xy 386.08 20.32))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e0290073-4a8b-461f-a06d-d344ba3927c0)
-  )
   (wire (pts (xy 184.15 185.42) (xy 184.15 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e053d785-20a7-40a8-8d3a-996b9045335f)
@@ -5393,10 +5324,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e191c468-de9a-41db-b97b-33aaa0059023)
   )
-  (wire (pts (xy 303.53 -34.29) (xy 303.53 -59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e19529e9-82a2-4e76-bd0b-a07abbc89513)
-  )
   (wire (pts (xy 392.43 140.97) (xy 392.43 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e1b17c9a-498b-43ba-b527-93aaab6161be)
@@ -5429,6 +5356,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e438671c-4449-4945-a835-a89118779b0b)
   )
+  (polyline (pts (xy 215.9 40.64) (xy 215.9 41.91))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e45f9ded-7cc7-4798-b778-22e6ba6bdf0d)
+  )
+
   (wire (pts (xy 212.09 133.35) (xy 215.9 133.35))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e46ecd61-0bbe-4b9f-a151-a2cacac5967b)
@@ -5449,10 +5381,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e5f15ad7-1bce-41bc-8507-088ffe98cc75)
   )
-  (wire (pts (xy 360.68 36.83) (xy 361.95 36.83))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e6342b84-9703-4b4f-8b68-7fa02d4ac053)
-  )
   (wire (pts (xy 342.9 86.36) (xy 342.9 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e6a0e25b-c410-47ee-a004-4e824f96b2f9)
@@ -5469,10 +5397,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8e23712-f080-4685-ae22-9028780f7b13)
   )
-  (wire (pts (xy 318.77 -39.37) (xy 313.69 -39.37))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e9b9f6ca-b237-4bc6-befc-b08e2e73e1cf)
-  )
   (wire (pts (xy 48.26 278.13) (xy 86.36 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb3c5a51-a6b8-4712-9f7e-2e174566319a)
@@ -5482,10 +5406,6 @@
     (uuid ec209dcc-10a3-48d4-89a8-89525669e3c2)
   )
 
-  (wire (pts (xy 351.79 36.83) (xy 351.79 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ec302f96-ff3c-4532-a8bd-4267ff5af6aa)
-  )
   (wire (pts (xy 62.23 227.33) (xy 58.42 227.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ec3c5ba0-0946-4b92-8364-887bc9db33b5)
@@ -5498,6 +5418,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ed1f5df2-cfb6-4083-a9e5-5d196546ef9b)
   )
+  (wire (pts (xy 351.79 30.48) (xy 351.79 35.56))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ed966add-0935-440f-92b4-dddfb40f6d05)
+  )
   (wire (pts (xy 58.42 220.98) (xy 58.42 227.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ede6eb60-8c60-4f52-b6d3-bff39a76a47a)
@@ -5530,9 +5454,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6b67fe8-cddc-463a-a9ee-225a85050a7f)
   )
-  (wire (pts (xy 349.25 123.19) (xy 349.25 127))
+  (wire (pts (xy 359.41 26.67) (xy 359.41 30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f7af03d3-e511-46bb-a87e-3f15adda81a7)
+    (uuid f775b5c9-38d8-4ac2-bb62-3186db2380f0)
   )
   (wire (pts (xy 397.51 67.31) (xy 383.54 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5591,10 +5515,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fdb73e1a-49b3-437a-83c3-435e929a8401)
   )
-  (wire (pts (xy 375.92 25.4) (xy 375.92 20.32))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fe0a7913-794e-46a4-b95b-ed34ac0e8a7f)
-  )
   (wire (pts (xy 82.55 199.39) (xy 77.47 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe431a80-868e-482d-aa91-c96eb8387d6a)
@@ -5607,6 +5527,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fec0f671-f96a-448a-bce8-86fa8507f9e6)
   )
+  (wire (pts (xy 349.25 127) (xy 356.87 127))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ff4ea17a-5073-4862-af7d-ac4acf2e1195)
+  )
   (wire (pts (xy 62.23 199.39) (xy 64.77 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffaf0ed9-3944-4c9c-928a-1a354995ddcd)
@@ -5620,15 +5544,11 @@
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 08753766-594e-40e4-85d0-cd3ea678eac9)
   )
-  (text "LO" (at 308.61 -91.44 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 09df5caa-1aca-4f8c-8d27-b59a358a0907)
-  )
   (text "RX" (at 171.45 111.76 270)
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 0e19beb0-71f5-4b11-b16f-58f80b7f3a28)
   )
-  (text "Diplexer" (at 350.52 21.59 0)
+  (text "Diplexer" (at 372.11 43.18 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 29dcba45-439b-4f41-aabb-51de21635866)
   )
@@ -5649,14 +5569,14 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3fdce84c-f89f-44da-ad99-8fe47fc4d746)
   )
+  (text "68pF\ntotal" (at 350.52 125.73 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 4a38b581-b8af-4aca-aba3-f4d3a9ad0d22)
+  )
   (text "LO" (at 361.95 67.31 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5946ec6c-3260-4308-ab81-2e2e73710bba)
   )
-  (text "RF" (at 326.39 -38.1 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 62c69181-6d23-4e1f-b854-486ef4187ee8)
-  )
   (text "QER XTAL\nfilter" (at 189.23 105.41 0)
     (effects (font (size 2 2)) (justify left bottom))
     (uuid 64fd2cf1-6ee9-4d94-80f3-748ffe82cdb0)
@@ -5665,11 +5585,11 @@
     (effects (font (size 2 2)) (justify left bottom))
     (uuid 6d019369-5096-4968-ad20-ad81643d4168)
   )
-  (text "11.0592MHz" (at 220.98 46.99 180)
+  (text "11.0592MHz" (at 218.44 46.99 180)
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 7077221a-9e28-4d4d-9d67-c484e9e76012)
   )
-  (text "TODO\nCalculate overall gain.\n Gain stage needed betwen XTAL filter and RF mixer?\nDefine how to do CW\nMixer termination\nMaybe try hang AGC EMRFD Fig 6.57\n\n\nDone\nRecalculate all filters, make Chebychev\nVoltage reg for IF amps (hybrid cascode: 9V)\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\nCalculate overall gain.\nDefine how to do CW\n\nDone\nMixer termination\nRecalculate all filters, make Chebychev\nVoltage reg for IF amps (hybrid cascode: 9V)\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 337.82 238.76 0)
     (effects (font (size 2 2)) (justify left bottom))
     (uuid 74c68bd1-c5af-4a14-af9a-5d066dace5fa)
@@ -5682,10 +5602,6 @@
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 88f5e55e-97d0-4a9c-a22f-62d75fab8b7a)
   )
-  (text "IF" (at 302.26 -16.51 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 8f0d03b5-d2e7-4da4-ab03-6819f296ec9b)
-  )
   (text "TX" (at 212.09 40.64 180)
     (effects (font (size 2 2)) (justify right bottom))
     (uuid 936e30e4-7734-4349-8792-c304696dd71b)
@@ -5704,6 +5620,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid adad8177-fb64-4063-bf0f-2679c5b1df16)
   )
+  (text "22pF calculated" (at 368.3 39.37 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid afa5edc1-d3f6-47a3-b2e0-7eb26dedb0cd)
+  )
   (text "Amp from uBitxv6\nwww.hfsignals.com\n+16dB" (at 162.56 26.67 0)
     (effects (font (size 2 2)) (justify left bottom))
     (uuid b5a7176e-a7da-4e61-abb9-b2f9a2050573)
@@ -5721,7 +5641,7 @@
     (uuid beb4ecd2-8952-4312-b33c-10488ade4109)
   )
   (text "Diplexer\nhttps://www.changpuak.ch/\n electronics/calc_16a.php\n11.1MHz Q=4"
-    (at 351.79 102.87 0)
+    (at 355.6 90.17 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d9381164-03df-4a08-9066-17eab5b599b1)
   )
@@ -5773,10 +5693,10 @@
     (uuid f61adca3-c1e4-457e-8212-9dc978cabab5)
   )
 
-  (global_label "+VTX" (shape input) (at 222.25 44.45 90) (fields_autoplaced)
+  (global_label "+VTX" (shape input) (at 219.71 44.45 90) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 36beb844-17a6-45b4-ae6f-6dbe3f2c22ca)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 222.3294 37.1988 90)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 219.7894 37.1988 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -5843,10 +5763,10 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "+VRX" (shape input) (at 213.36 80.01 180) (fields_autoplaced)
+  (global_label "+VRX" (shape input) (at 210.82 80.01 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid bb9f0a9d-166d-4795-bca4-87abba8f2430)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 205.8064 80.0894 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 203.2664 80.0894 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
@@ -7496,22 +7416,22 @@
     (pin "3" (uuid e1bd6cf2-4479-4c44-8076-1f9b0ff7daf0))
   )
 
-  (symbol (lib_id "Device:R") (at 222.25 50.8 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 219.71 50.8 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0744aae1-0f55-4eec-9577-146db9501980)
-    (property "Reference" "R?" (id 0) (at 224.79 49.5299 0)
+    (property "Reference" "R?" (id 0) (at 222.25 49.5299 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "680" (id 1) (at 224.79 52.0699 0)
+    (property "Value" "680" (id 1) (at 222.25 52.0699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 220.472 50.8 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 217.932 50.8 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 222.25 50.8 0)
+    (property "Datasheet" "~" (id 3) (at 219.71 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 222.25 50.8 0)
+    (property "Need_order" "" (id 4) (at 219.71 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 50ae2156-7897-470b-845a-0493afaf5e2f))
@@ -7785,21 +7705,21 @@
     (pin "2" (uuid 833dbded-0b81-4655-9b7a-816815f21b74))
   )
 
-  (symbol (lib_id "Device:L") (at 356.87 34.29 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:L") (at 355.6 26.67 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1408f7bf-70f2-4343-ab61-d8ea398638a7)
-    (property "Reference" "L?" (id 0) (at 356.87 27.94 90))
-    (property "Value" "TBD" (id 1) (at 356.87 30.48 90))
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 356.87 34.29 0)
+    (property "Reference" "L?" (id 0) (at 355.6 20.32 90))
+    (property "Value" "56nH" (id 1) (at 355.6 22.86 90))
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 355.6 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 356.87 34.29 0)
+    (property "Datasheet" "~" (id 3) (at 355.6 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 356.87 34.29 0)
+    (property "MPN" "" (id 4) (at 355.6 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 356.87 34.29 0)
+    (property "Need_order" "" (id 5) (at 355.6 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0c7b592a-d909-4653-b131-5f90965893bc))
@@ -7865,6 +7785,27 @@
     (pin "2" (uuid 830030d8-ad0e-48c4-a35c-5fe14717a1ac))
   )
 
+  (symbol (lib_id "Device:C") (at 355.6 35.56 270) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 1553116c-e663-4098-ad25-fa58585a8d83)
+    (property "Reference" "C?" (id 0) (at 355.6 39.37 90))
+    (property "Value" "DNF" (id 1) (at 355.6 41.91 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 351.79 34.5948 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 355.6 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 355.6 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 355.6 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 164d675e-b5ba-457f-98f8-be8a499c9a77))
+    (pin "2" (uuid 6f612a60-7ed9-4fb1-b3e3-aa6d6508b966))
+  )
+
   (symbol (lib_id "Device:R") (at 217.17 171.45 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 158d9815-0e3d-4623-8a00-b0d0b263d33d)
@@ -7883,31 +7824,6 @@
     (pin "2" (uuid 7eb90f53-b20c-4cd3-bee3-eaf5ffdd71f1))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 313.69 -24.13 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 168ee993-6a85-48af-b8f8-0d87ada9138a)
-    (property "Reference" "T?" (id 0) (at 320.04 -24.1428 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Value" "10t tri, 43, or MABA-009488" (id 1) (at 307.975 -22.8728 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Footprint" "" (id 2) (at 313.69 -24.13 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 313.69 -24.13 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "5943004901" (id 4) (at 313.69 -24.13 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d837f874-2731-4f58-92c6-251dd6c0514d))
-    (pin "2" (uuid 2c8bb801-b069-42f8-8c24-6cfab8a9ed62))
-    (pin "3" (uuid ee14aee3-ca2c-459f-9589-45bbf43d26d4))
-    (pin "4" (uuid 856047cb-4592-40e5-a3be-a986f562fc8b))
-    (pin "5" (uuid 60103118-7c04-4430-ab04-686a621c3b34))
-  )
-
   (symbol (lib_id "Device:C") (at 137.16 199.39 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 17237996-c99d-4dd3-ae47-56edd68403a1)
@@ -7958,24 +7874,6 @@
     (pin "2" (uuid 7edbf915-afe3-4a77-b410-8a0debb3aa75))
   )
 
-  (symbol (lib_id "power:GNDA") (at 318.77 -83.82 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 185efd6b-f96f-4eeb-a457-2c5727f22e1b)
-    (property "Reference" "#PWR?" (id 0) (at 325.12 -83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 323.85 -83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 318.77 -83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 318.77 -83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2b48aab2-ec97-4bf6-b686-0af28d81a1b5))
-  )
-
   (symbol (lib_id "Diode:1N4148W") (at 137.16 191.77 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 18af8082-b22e-4c06-822c-3343997bf83a)
@@ -8001,6 +7899,28 @@
     (pin "2" (uuid a6c056ea-0f1e-4ff2-b658-a7294c2f9f2a))
   )
 
+  (symbol (lib_id "Device:C_Trim") (at 370.84 33.02 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 1b453f05-7b71-4d16-be09-06da53d82fd3)
+    (property "Reference" "C?" (id 0) (at 369.57 30.48 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "5.5-30pF" (id 1) (at 375.92 36.83 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 370.84 33.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/J_Series_Trim-cap-Knowles.pdf" (id 3) (at 370.84 33.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "JZ-300" (id 4) (at 370.84 33.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b29101f5-de7f-450a-ac7c-6741156f5a40))
+    (pin "2" (uuid 032411db-e6c5-472a-8d53-5bf63733c925))
+  )
+
   (symbol (lib_id "Device:R") (at 157.48 210.82 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1c6bd12f-7bbe-4060-86be-39f772f2c3d2)
@@ -8080,18 +8000,36 @@
     (pin "2" (uuid c3ffd54b-9054-4b07-a3e2-9394e50d4ef4))
   )
 
-  (symbol (lib_id "Device:R") (at 217.17 80.01 90) (unit 1)
+  (symbol (lib_name "GND_1") (lib_id "power:GND") (at 223.52 86.36 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 21e5965f-c80d-4aea-9778-82da6a7dcf9c)
+    (property "Reference" "#PWR?" (id 0) (at 223.52 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 223.5199 90.17 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 223.52 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 223.52 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 78ad0514-eff9-4015-81d2-46d8e531ca7c))
+  )
+
+  (symbol (lib_id "Device:R") (at 214.63 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 21eb2902-a356-4898-a7c3-73cb39e31148)
-    (property "Reference" "R?" (id 0) (at 217.17 73.66 90))
-    (property "Value" "680" (id 1) (at 217.17 76.2 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 217.17 81.788 90)
+    (property "Reference" "R?" (id 0) (at 214.63 73.66 90))
+    (property "Value" "680" (id 1) (at 214.63 76.2 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 214.63 81.788 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 217.17 80.01 0)
+    (property "Datasheet" "~" (id 3) (at 214.63 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 217.17 80.01 0)
+    (property "Need_order" "" (id 4) (at 214.63 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fcc7d711-d995-4ab5-b215-982d32bdb63d))
@@ -8116,22 +8054,22 @@
     (pin "1" (uuid fd7db913-df8e-482b-b219-9f37e6954909))
   )
 
-  (symbol (lib_id "mpb:BAT18") (at 222.25 63.5 90) (unit 1)
+  (symbol (lib_id "mpb:BAT18") (at 219.71 63.5 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 22876913-25d1-4469-998a-abbe3cf699e7)
-    (property "Reference" "D?" (id 0) (at 224.79 61.6457 90)
+    (property "Reference" "D?" (id 0) (at 222.25 61.6457 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "BAT18" (id 1) (at 224.79 64.1857 90)
+    (property "Value" "BAT18" (id 1) (at 222.25 64.1857 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at 220.98 63.5 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at 218.44 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 222.25 63.5 0)
+    (property "Datasheet" "~" (id 3) (at 219.71 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 222.25 63.5 0)
+    (property "Need_order" "" (id 4) (at 219.71 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a8c9bd93-e511-488b-818e-688627158714))
@@ -8530,6 +8468,24 @@
     (pin "2" (uuid 309c1e7b-a102-4553-954f-79a7949fbd34))
   )
 
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 250.19 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 3405d8d6-f6e1-4a11-bed0-85eaf60eac15)
+    (property "Reference" "H?" (id 0) (at 252.73 82.5754 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3" (id 1) (at 252.73 84.8868 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 250.19 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 250.19 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7f54f227-f626-4788-9708-740bf3a6f32d))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 275.59 190.5 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3429f415-832d-4124-a5a2-16ea0b851c6b)
@@ -9172,6 +9128,52 @@
     (pin "2" (uuid 8a2c386f-f285-4df5-9c84-8dc3e26d5b7c))
   )
 
+  (symbol (lib_id "Device:C") (at 372.11 106.68 270) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 502d9353-c59a-46c5-a6f0-e11b971054e6)
+    (property "Reference" "C?" (id 0) (at 368.3 105.41 90))
+    (property "Value" "DNF" (id 1) (at 368.3 107.95 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 368.3 107.6452 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 372.11 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 372.11 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 372.11 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b6ab33e4-7c2d-4387-b6ba-42ad1433da7b))
+    (pin "2" (uuid 2d598be7-5c2c-4844-afa4-866f755c9268))
+  )
+
+  (symbol (lib_id "Device:L") (at 353.06 113.03 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 53ea3487-7613-408f-895e-cc2b27babb6f)
+    (property "Reference" "L?" (id 0) (at 354.33 111.7599 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "1uH" (id 1) (at 354.33 114.2999 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 353.06 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 353.06 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "LQW2UAS1R0" (id 4) (at 353.06 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 353.06 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 94a60c51-2b89-4989-8e9a-a59a846acefb))
+    (pin "2" (uuid 377865dd-4711-4bfa-9363-7c1b0932e103))
+  )
+
   (symbol (lib_id "power:GNDA") (at 31.75 255.27 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5428513b-9d99-4885-98b6-82fde890fffa)
@@ -9346,24 +9348,6 @@
     (pin "1" (uuid a79e5917-a5a3-4893-b1c7-fc4fc8203373))
   )
 
-  (symbol (lib_id "power:GNDA") (at 313.69 -63.5 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5a4791ba-491f-4432-961f-1b249da54e4f)
-    (property "Reference" "#PWR?" (id 0) (at 313.69 -57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 313.817 -59.1058 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 313.69 -63.5 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 313.69 -63.5 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f34a3f2c-7828-4621-b257-e6d486360d18))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 237.49 140.97 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5a9a14a2-a94b-4a05-89b3-2d881c558bbc)
@@ -9725,27 +9709,6 @@
     (pin "3" (uuid 321311e9-24b7-4c19-9eaf-af53c019cd38))
   )
 
-  (symbol (lib_id "Device:RFShield_OnePiece") (at 226.06 -44.45 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6d820c62-2ab0-46e1-a4bf-ebea05473b6c)
-    (property "Reference" "J?" (id 0) (at 242.57 -45.7201 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "BMI-S-209-F+BMI-S-209-C" (id 1) (at 242.57 -43.1801 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 226.06 -41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 226.06 -41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "BMI-S-209-F" (id 4) (at 226.06 -44.45 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 11ff7560-646d-487e-95fe-b70c4ae2e11e))
-  )
-
   (symbol (lib_id "Device:R") (at 90.17 278.13 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6e1d6d12-33c4-4425-b777-e6be89c751b6)
@@ -9764,6 +9727,24 @@
     (pin "2" (uuid 7901336a-c9df-4691-843b-c244f9d3c14a))
   )
 
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 222.25 95.25 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6e6ad394-2843-44bf-911b-68a30e0625c2)
+    (property "Reference" "H?" (id 0) (at 224.79 94.0054 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3" (id 1) (at 224.79 96.3168 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 222.25 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 222.25 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 92e55a4f-4c27-43c5-81de-472c3ce96e56))
+  )
+
   (symbol (lib_id "Device:R") (at 153.67 43.18 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6f125446-9ec7-42fb-ac67-3c6a68656a7d)
@@ -9925,6 +9906,42 @@
     (pin "1" (uuid 8c7f9768-721f-494a-b074-318bfeee990b))
   )
 
+  (symbol (lib_name "GND_1") (lib_id "power:GND") (at 251.46 97.79 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 79efe5c4-4576-4907-838e-8e31b5a187ad)
+    (property "Reference" "#PWR?" (id 0) (at 251.46 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 251.4599 101.6 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 251.46 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 251.46 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a9ff0b3a-8c97-4138-a9e2-240c022a5d33))
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 223.52 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 79fb8ee0-4ff5-461f-bae1-22d3394622ca)
+    (property "Reference" "H?" (id 0) (at 226.06 82.5754 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3" (id 1) (at 226.06 84.8868 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 223.52 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 223.52 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 00aa313e-1122-425b-8006-c7d6763a2bd4))
+  )
+
   (symbol (lib_id "mpb:BAT68-04W") (at 391.16 165.1 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7b670018-8364-43c9-bd09-145ba5097766)
@@ -9943,22 +9960,22 @@
     (pin "3" (uuid 7328973a-6aa3-4953-9d8e-703bc1fcb4a1))
   )
 
-  (symbol (lib_id "Device:R") (at 359.41 107.95 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 363.22 95.25 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7cb6dfde-68d6-4b5e-a880-f8459945a944)
-    (property "Reference" "R?" (id 0) (at 361.95 106.6799 0)
+    (property "Reference" "R?" (id 0) (at 365.76 93.9799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "50" (id 1) (at 361.95 109.2199 0)
+    (property "Value" "50" (id 1) (at 365.76 96.5199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 357.632 107.95 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 361.442 95.25 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 359.41 107.95 0)
+    (property "Datasheet" "~" (id 3) (at 363.22 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 359.41 107.95 0)
+    (property "Need_order" "" (id 4) (at 363.22 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6c2b031a-febb-4918-a7ba-13bcae564a8e))
@@ -10131,21 +10148,21 @@
     (pin "2" (uuid c7b702d8-d68c-476e-8d1d-7e5d2d8c2970))
   )
 
-  (symbol (lib_id "Device:L") (at 368.3 118.11 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:L") (at 372.11 113.03 90) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid 8554cc98-0cbb-4f6a-b636-f2917076a214)
-    (property "Reference" "L?" (id 0) (at 368.3 120.65 90))
-    (property "Value" "TBD" (id 1) (at 368.3 123.19 90))
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 368.3 118.11 0)
+    (property "Reference" "L?" (id 0) (at 368.3 111.76 90))
+    (property "Value" "180nH" (id 1) (at 370.84 114.3 90))
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 372.11 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 368.3 118.11 0)
+    (property "Datasheet" "~" (id 3) (at 372.11 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 368.3 118.11 0)
+    (property "MPN" "LQW2BASR18G00L" (id 4) (at 372.11 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 368.3 118.11 0)
+    (property "Need_order" "" (id 5) (at 372.11 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2abe157e-5f10-4bb4-8db4-f0c08e8422d0))
@@ -10247,19 +10264,19 @@
     (pin "1" (uuid 1b21bb65-6d04-4d66-8c5f-d6905fe6b063))
   )
 
-  (symbol (lib_id "power:GNDA") (at 365.76 20.32 270) (mirror x) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 350.52 30.48 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 875ff648-5857-4668-acf4-896c854e9216)
-    (property "Reference" "#PWR?" (id 0) (at 359.41 20.32 0)
+    (property "Reference" "#PWR?" (id 0) (at 344.17 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 361.3658 20.193 0)
+    (property "Value" "GNDA" (id 1) (at 346.1258 30.353 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 365.76 20.32 0)
+    (property "Footprint" "" (id 2) (at 350.52 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 365.76 20.32 0)
+    (property "Datasheet" "" (id 3) (at 350.52 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e11319a8-f709-415c-9cfa-817680c9752c))
@@ -10500,24 +10517,42 @@
     (pin "2" (uuid 060b50cc-dfb0-4051-bf14-860fe9cdb674))
   )
 
-  (symbol (lib_id "power:GNDA") (at 372.11 115.57 90) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 375.92 102.87 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 942acf4b-8a96-4c46-ac34-0486d093be57)
-    (property "Reference" "#PWR?" (id 0) (at 378.46 115.57 0)
+    (property "Reference" "#PWR?" (id 0) (at 382.27 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 376.5042 115.443 0)
+    (property "Value" "GNDA" (id 1) (at 380.3142 102.743 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 372.11 115.57 0)
+    (property "Footprint" "" (id 2) (at 375.92 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 372.11 115.57 0)
+    (property "Datasheet" "" (id 3) (at 375.92 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3bbb210a-5efd-4f87-a973-41c11d7503c9))
   )
 
+  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 251.46 95.25 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 943b5dab-47d5-4758-9e77-ad916238d21e)
+    (property "Reference" "H?" (id 0) (at 254 94.0054 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M3" (id 1) (at 254 96.3168 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (id 2) (at 251.46 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 251.46 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8319fcfb-dda3-450e-9544-2f8ea0f83e57))
+  )
+
   (symbol (lib_id "power:GNDA") (at 318.77 240.03 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 94a0256b-3533-4ef4-82a8-5a55804c7f98)
@@ -10536,21 +10571,21 @@
     (pin "1" (uuid 535dce54-0bf0-4925-a459-8e52925a4685))
   )
 
-  (symbol (lib_id "Device:C") (at 368.3 113.03 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:C") (at 372.11 100.33 270) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid 9578d03f-4ecf-4253-ab7c-8492982a3872)
-    (property "Reference" "C?" (id 0) (at 368.3 105.41 90))
-    (property "Value" "TBD" (id 1) (at 368.3 107.95 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 364.49 113.9952 0)
+    (property "Reference" "C?" (id 0) (at 368.3 99.06 90))
+    (property "Value" "1.2nF" (id 1) (at 368.3 101.6 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 368.3 101.2952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 368.3 113.03 0)
+    (property "Datasheet" "~" (id 3) (at 372.11 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 368.3 113.03 0)
+    (property "MPN" "" (id 4) (at 372.11 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 368.3 113.03 0)
+    (property "Need_order" "" (id 5) (at 372.11 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 543c7552-2762-4627-a0e8-75474b87a740))
@@ -10687,22 +10722,22 @@
     (pin "1" (uuid 5b4ea8ef-1b9d-4b90-aeff-063529541d76))
   )
 
-  (symbol (lib_id "mpb:BAT18") (at 222.25 71.12 270) (unit 1)
+  (symbol (lib_id "mpb:BAT18") (at 219.71 71.12 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9abf27f2-e020-45d9-8118-9c58af667d59)
-    (property "Reference" "D?" (id 0) (at 224.79 70.4341 90)
+    (property "Reference" "D?" (id 0) (at 222.25 70.4341 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAT18" (id 1) (at 224.79 72.9741 90)
+    (property "Value" "BAT18" (id 1) (at 222.25 72.9741 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at 223.52 71.12 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at 220.98 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 222.25 71.12 0)
+    (property "Datasheet" "~" (id 3) (at 219.71 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 222.25 71.12 0)
+    (property "Need_order" "" (id 4) (at 219.71 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 90c8b2e6-9f16-452d-a36c-4b819b39a991))
@@ -10906,21 +10941,25 @@
     (pin "2" (uuid 9fe5e4d2-326c-4c1e-bddd-39e6a4974ed5))
   )
 
-  (symbol (lib_id "Device:C") (at 369.57 20.32 90) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:C") (at 375.92 33.02 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid a1d85b9a-d478-4ddf-b10d-3e565fcdc951)
-    (property "Reference" "C?" (id 0) (at 369.57 27.94 90))
-    (property "Value" "TBD" (id 1) (at 369.57 25.4 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 373.38 21.2852 0)
+    (property "Reference" "C?" (id 0) (at 378.46 30.48 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "DNF" (id 1) (at 381 35.56 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 376.8852 29.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 369.57 20.32 0)
+    (property "Datasheet" "~" (id 3) (at 375.92 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 369.57 20.32 0)
+    (property "MPN" "" (id 4) (at 375.92 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 369.57 20.32 0)
+    (property "Need_order" "" (id 5) (at 375.92 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5cce2c26-46c2-46bc-a6bd-87e81d3be368))
@@ -11083,42 +11122,6 @@
     (pin "1" (uuid 5919cb68-dab6-4b27-93e8-16a7b501ca83))
   )
 
-  (symbol (lib_id "mpb:BAT68-04W") (at 313.69 -54.61 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a62849a4-56d6-4f1a-808b-3a130d80d338)
-    (property "Reference" "D?" (id 0) (at 313.69 -50.8 0))
-    (property "Value" "BAT68-04W" (id 1) (at 313.69 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 311.785 -51.435 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 313.69 -54.61 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 038d61ae-f8d1-44fb-9b81-083d1e31cfcf))
-    (pin "2" (uuid ca52f153-c880-4b10-a90f-cef340360315))
-    (pin "3" (uuid 2a0c8a81-8c5d-4002-89c1-2d89fdcd11f1))
-  )
-
-  (symbol (lib_id "mpb:BAT68-04W") (at 313.69 -44.45 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a72ab4b4-04af-4bfa-a645-e3e9e424a971)
-    (property "Reference" "D?" (id 0) (at 313.69 -48.26 0))
-    (property "Value" "BAT68-04W" (id 1) (at 313.69 -50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-323_SC-70_Handsoldering" (id 2) (at 315.595 -47.625 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 313.69 -44.45 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fc460d67-48ac-45da-8819-f264f15d7926))
-    (pin "2" (uuid f5b6a391-4f44-4540-a370-38bc84296ea8))
-    (pin "3" (uuid 71acf4b8-2234-49a0-a154-cd6b91eb3715))
-  )
-
   (symbol (lib_id "Device:Crystal_Small") (at 269.24 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a77d3849-32de-42c0-a6c4-9bb6c1374ddb)
@@ -11241,25 +11244,25 @@
     (pin "2" (uuid 26c39743-2990-450a-9610-65a52205b0bd))
   )
 
-  (symbol (lib_id "Device:L") (at 349.25 119.38 180) (unit 1)
+  (symbol (lib_id "Device:L") (at 353.06 97.79 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a94ee8cd-c574-40c4-8eda-7a181fc1dac0)
-    (property "Reference" "L?" (id 0) (at 350.52 118.1099 0)
+    (property "Reference" "L?" (id 0) (at 354.33 96.5199 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "TBD" (id 1) (at 350.52 120.6499 0)
+    (property "Value" "1uH" (id 1) (at 354.33 99.0599 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 349.25 119.38 0)
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 353.06 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 349.25 119.38 0)
+    (property "Datasheet" "~" (id 3) (at 353.06 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 349.25 119.38 0)
+    (property "MPN" "LQW2UAS1R0" (id 4) (at 353.06 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 349.25 119.38 0)
+    (property "Need_order" "" (id 5) (at 353.06 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b2f33f2b-f13d-4a2d-bcbb-c7e3b6a3bd7a))
@@ -11609,6 +11612,28 @@
     (pin "2" (uuid 3ae5cef9-19f2-48aa-a2a7-422992386a6d))
   )
 
+  (symbol (lib_id "Device:C_Trim") (at 349.25 120.65 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid b76cab12-dafe-4489-9546-d6b71c0ace19)
+    (property "Reference" "C?" (id 0) (at 345.44 119.1259 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "5.5-30pF" (id 1) (at 347.98 124.46 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 349.25 120.65 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/J_Series_Trim-cap-Knowles.pdf" (id 3) (at 349.25 120.65 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "JZ-300" (id 4) (at 349.25 120.65 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5b59f3df-0add-40d5-80f9-096e16fea3d3))
+    (pin "2" (uuid 8ac8279f-41c3-4512-aaf8-8bdc6641cce6))
+  )
+
   (symbol (lib_id "Transistor_FET:MMBFJ113") (at 243.84 214.63 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b7f9f23f-60e3-4c4e-853f-947cb2a713bf)
@@ -11713,47 +11738,54 @@
     (pin "1" (uuid 34811645-95f7-4106-899f-7e00f520f4cc))
   )
 
-  (symbol (lib_id "power:GNDA") (at 351.79 35.56 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 313.69 237.49 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ba0f8620-397b-40ec-b03e-fef8bf57026b)
-    (property "Reference" "#PWR?" (id 0) (at 345.44 35.56 0)
+    (uuid bc69f267-5af2-4c78-8447-7475c36ef07a)
+    (property "Reference" "C?" (id 0) (at 316.23 236.2135 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "DNF" (id 1) (at 316.23 238.7535 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 313.69 237.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 347.3958 35.433 0)
+    (property "Datasheet" "~" (id 3) (at 313.69 237.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 351.79 35.56 0)
+    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 313.69 237.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 351.79 35.56 0)
+    (property "Need_order" "" (id 5) (at 313.69 237.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4e21e75b-f2be-4d97-8d6f-d180c4ab520c))
+    (pin "1" (uuid 46a2e267-6c27-426e-bbb0-4671842e7a7e))
+    (pin "2" (uuid 75574006-40e0-4035-a637-5243ae420bda))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 313.69 237.49 180) (unit 1)
+  (symbol (lib_id "Device:L") (at 353.06 105.41 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid bc69f267-5af2-4c78-8447-7475c36ef07a)
-    (property "Reference" "C?" (id 0) (at 316.23 236.2135 0)
+    (uuid bd19b829-bf5e-4a8d-8e02-dcc05d43c934)
+    (property "Reference" "L?" (id 0) (at 354.33 104.1399 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "DNF" (id 1) (at 316.23 238.7535 0)
+    (property "Value" "1uH" (id 1) (at 354.33 106.6799 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 313.69 237.49 0)
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 353.06 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 313.69 237.49 0)
+    (property "Datasheet" "~" (id 3) (at 353.06 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "GRM188R71H104KA93D" (id 4) (at 313.69 237.49 0)
+    (property "MPN" "LQW2UAS1R0" (id 4) (at 353.06 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 313.69 237.49 0)
+    (property "Need_order" "" (id 5) (at 353.06 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 46a2e267-6c27-426e-bbb0-4671842e7a7e))
-    (pin "2" (uuid 75574006-40e0-4035-a637-5243ae420bda))
+    (pin "1" (uuid a921fac4-5a89-417f-b8a2-f3047dff6b85))
+    (pin "2" (uuid ae252d12-717f-41f0-994b-3a8f10a1cdb4))
   )
 
   (symbol (lib_id "Transistor_BJT:MMBT3904") (at 302.26 204.47 0) (mirror y) (unit 1)
@@ -11948,29 +11980,22 @@
     (pin "1" (uuid 2ca57911-bf02-4834-84bc-276666a12d4e))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 313.69 -73.66 270) (unit 1)
+  (symbol (lib_name "GND_1") (lib_id "power:GND") (at 222.25 97.79 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c36f262a-d5d7-4c06-9442-d6dd1470d26d)
-    (property "Reference" "T?" (id 0) (at 320.04 -73.6474 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid c305303a-9f6b-453c-a3bf-228d1c540671)
+    (property "Reference" "#PWR?" (id 0) (at 222.25 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "10t tri, 43, or MABA-009488" (id 1) (at 307.975 -72.3774 90)
+    (property "Value" "GND" (id 1) (at 222.2499 101.6 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "" (id 2) (at 313.69 -73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 313.69 -73.66 0)
+    (property "Footprint" "" (id 2) (at 222.25 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "5943004901" (id 4) (at 313.69 -73.66 90)
+    (property "Datasheet" "" (id 3) (at 222.25 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1a018bfa-5cd1-46a6-9739-e041d0057847))
-    (pin "2" (uuid 3a75e970-2326-4a83-a9ba-7a299f3c0481))
-    (pin "3" (uuid 99738cc4-e8aa-41be-9385-3a4b9465bbc3))
-    (pin "4" (uuid 4dd2d59b-5903-4f92-8680-90ba3b0ef252))
-    (pin "5" (uuid 38217bfd-abb7-4982-9eb4-67b139f62326))
+    (pin "1" (uuid 2c2ad513-de87-4344-8e1a-8e697c7436f1))
   )
 
   (symbol (lib_id "Device:L_Iron") (at 299.72 191.77 0) (mirror x) (unit 1)
@@ -11992,25 +12017,25 @@
     (pin "2" (uuid ef21c44e-2c9f-44f4-9bc0-01c895c955b0))
   )
 
-  (symbol (lib_id "Device:L") (at 375.92 29.21 0) (mirror x) (unit 1)
+  (symbol (lib_id "Device:L") (at 375.92 25.4 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c4c2b891-35df-418d-94f8-55f70462058e)
-    (property "Reference" "L?" (id 0) (at 374.65 27.9399 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Reference" "L?" (id 0) (at 374.65 24.1299 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "TBD" (id 1) (at 374.65 30.4799 0)
-      (effects (font (size 1.27 1.27)) (justify right))
+    (property "Value" "220nH" (id 1) (at 374.65 26.6699 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 375.92 29.21 0)
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 375.92 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 375.92 29.21 0)
+    (property "Datasheet" "~" (id 3) (at 375.92 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 375.92 29.21 0)
+    (property "MPN" "" (id 4) (at 375.92 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 375.92 29.21 0)
+    (property "Need_order" "" (id 5) (at 375.92 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ea997f69-1068-4bd3-b13c-1489245a7213))
@@ -12329,21 +12354,21 @@
     (pin "2" (uuid df5c6a5c-1b9c-4aa6-86e4-a848358c56ac))
   )
 
-  (symbol (lib_id "Device:C") (at 365.76 35.56 90) (mirror x) (unit 1)
+  (symbol (lib_id "Device:C") (at 355.6 30.48 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d0ce5d3b-40dc-47ba-bceb-ad34add046b2)
-    (property "Reference" "C?" (id 0) (at 365.76 39.37 90))
-    (property "Value" "TBD" (id 1) (at 365.76 41.91 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 369.57 36.5252 0)
+    (property "Reference" "C?" (id 0) (at 353.06 29.21 90))
+    (property "Value" "90pF" (id 1) (at 351.79 33.02 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 359.41 31.4452 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 365.76 35.56 0)
+    (property "Datasheet" "~" (id 3) (at 355.6 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 365.76 35.56 0)
+    (property "MPN" "" (id 4) (at 355.6 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 365.76 35.56 0)
+    (property "Need_order" "" (id 5) (at 355.6 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0780b825-122a-4c30-8d54-f82bf0485e75))
@@ -12438,22 +12463,6 @@
     (pin "3" (uuid 0b40d2a0-2ce3-4914-83fb-382e0a8262da))
   )
 
-  (symbol (lib_id "power:GNDA") (at 226.06 -34.29 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d4945a82-a7fe-4d4d-9d20-acb8b3935d7d)
-    (property "Reference" "#PWR?" (id 0) (at 226.06 -27.94 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 226.06 -27.94 0))
-    (property "Footprint" "" (id 2) (at 226.06 -34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 226.06 -34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7d0e3a83-e5d2-41c3-89e3-20a04f03313a))
-  )
-
   (symbol (lib_id "Device:R") (at 198.12 175.26 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d640a686-0942-4572-8069-29ae73604d19)
@@ -12476,6 +12485,28 @@
     (pin "2" (uuid 1ed23ce5-870f-4703-8043-56202b71a806))
   )
 
+  (symbol (lib_id "Device:R") (at 364.49 24.13 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid d66eb776-ae77-4330-85c9-1d726564e4ac)
+    (property "Reference" "R?" (id 0) (at 361.95 17.78 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "47" (id 1) (at 361.95 20.32 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 366.268 24.13 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 364.49 24.13 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 364.49 24.13 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 49806f1f-c6fc-4458-903a-3733e4b3beea))
+    (pin "2" (uuid a0362c97-ae8a-4068-800a-2fe9ea0b5e2e))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 224.79 140.97 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d6f97ca1-d91f-4bb3-a147-15595f32008c)
@@ -12765,49 +12796,71 @@
     (pin "2" (uuid 683e0f5d-5082-4bf8-a437-952f8d863726))
   )
 
-  (symbol (lib_id "Device:R") (at 356.87 36.83 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:R") (at 364.49 36.83 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid ec5214c1-0ae2-42b3-8bc8-6fa8ab10fe5e)
-    (property "Reference" "R?" (id 0) (at 356.87 40.64 90))
-    (property "Value" "47" (id 1) (at 356.87 43.18 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 356.87 38.608 90)
+    (property "Reference" "R?" (id 0) (at 361.95 40.64 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "47" (id 1) (at 361.95 43.18 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 366.268 36.83 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 356.87 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 364.49 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 356.87 36.83 0)
+    (property "Need_order" "" (id 4) (at 364.49 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b036a813-1868-4a9e-9cfa-83576467a2bc))
     (pin "2" (uuid ba9db151-19ab-4ef3-bbc7-b949bcab7738))
   )
 
-  (symbol (lib_id "Device:C") (at 349.25 111.76 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:C") (at 356.87 120.65 0) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid f098ce67-0336-4914-9677-9b654f4c37f1)
-    (property "Reference" "C?" (id 0) (at 353.06 110.4899 0)
+    (property "Reference" "C?" (id 0) (at 358.14 118.11 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "TBD" (id 1) (at 353.06 113.0299 0)
+    (property "Value" "47pF" (id 1) (at 358.14 124.46 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 350.2152 115.57 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 357.8352 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 349.25 111.76 0)
+    (property "Datasheet" "~" (id 3) (at 356.87 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 349.25 111.76 0)
+    (property "MPN" "" (id 4) (at 356.87 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 349.25 111.76 0)
+    (property "Need_order" "" (id 5) (at 356.87 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 05c74720-3deb-4e23-b209-a3512229317a))
     (pin "2" (uuid b72e3b8e-ee01-43ce-8df3-720f51b50c1f))
   )
 
+  (symbol (lib_name "GND_1") (lib_id "power:GND") (at 250.19 86.36 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f1fb900d-270a-452d-847d-a2763e9f9a51)
+    (property "Reference" "#PWR?" (id 0) (at 250.19 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 250.1899 90.17 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 250.19 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 250.19 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d73b7130-ff43-4c6b-8d64-1a49332da793))
+  )
+
   (symbol (lib_id "power:GNDA") (at 71.12 270.51 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f35243ea-70a8-4861-b1e5-87022345fc08)
@@ -12962,24 +13015,6 @@
     (pin "5" (uuid 7457cfc0-7b3a-4bef-9dd7-87398bfb27bf))
   )
 
-  (symbol (lib_id "power:GNDA") (at 318.77 -13.97 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid fb43d9a5-77ef-4e0c-93ca-74cab7be4888)
-    (property "Reference" "#PWR?" (id 0) (at 318.77 -7.62 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GNDA" (id 1) (at 318.897 -9.5758 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 318.77 -13.97 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 318.77 -13.97 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 38cfaa5b-c2df-4546-bc9a-1ba460007dc9))
-  )
-
   (symbol (lib_id "Transistor_BJT:MMBT3904") (at 308.61 86.36 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fcc09aa7-20c5-461e-9720-061617404889)
@@ -13006,22 +13041,22 @@
     (pin "3" (uuid cb80ca26-9f51-4e70-853b-0d6f5e268e48))
   )
 
-  (symbol (lib_id "Device:R") (at 359.41 123.19 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 363.22 118.11 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fdbd7fff-86a6-4aac-a458-e736136c8e38)
-    (property "Reference" "R?" (id 0) (at 361.95 121.9199 0)
+    (property "Reference" "R?" (id 0) (at 365.76 116.8399 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "50" (id 1) (at 361.95 124.4599 0)
+    (property "Value" "50" (id 1) (at 365.76 119.3799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 357.632 123.19 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 361.442 118.11 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 359.41 123.19 0)
+    (property "Datasheet" "~" (id 3) (at 363.22 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 359.41 123.19 0)
+    (property "Need_order" "" (id 4) (at 363.22 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 920d5a5a-c060-4efd-aaa4-52e704f882f5))