diff --git a/PCB/FloatPUMP/FloatPUMP.kicad_prl b/PCB/FloatPUMP/FloatPUMP.kicad_prl
index 96a09f9..813f86a 100644
--- a/PCB/FloatPUMP/FloatPUMP.kicad_prl
+++ b/PCB/FloatPUMP/FloatPUMP.kicad_prl
@@ -1,7 +1,7 @@
 {
   "board": {
     "active_layer": 0,
-    "active_layer_preset": "",
+    "active_layer_preset": "All Layers",
     "auto_track_width": true,
     "hidden_nets": [],
     "high_contrast_mode": 0,
diff --git a/PCB/FloatPUMP/FloatPUMP.kicad_sch b/PCB/FloatPUMP/FloatPUMP.kicad_sch
index ba03ee5..17f79e8 100644
--- a/PCB/FloatPUMP/FloatPUMP.kicad_sch
+++ b/PCB/FloatPUMP/FloatPUMP.kicad_sch
@@ -334,6 +334,48 @@
         )
       )
     )
+    (symbol "Connector:TestPoint_Alt" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint_Alt" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point (alternative shape)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_Alt_0_1"
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy -0.762 3.302)
+            (xy 0 4.064)
+            (xy 0.762 3.302)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "TestPoint_Alt_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:Battery_Cell" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "BT" (id 0) (at 2.54 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -528,12 +570,12 @@
         )
       )
     )
-    (symbol "Device:D_Schottky" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "Device:Crystal_GND24" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "Y" (id 0) (at 3.175 5.08 0)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "D_Schottky" (id 1) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "Crystal_GND24" (id 1) (at 3.175 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -541,56 +583,106 @@
       (property "Datasheet" "~" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode Schottky" (id 4) (at 0 0 0)
+      (property "ki_keywords" "quartz ceramic resonator oscillator" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Schottky diode" (id 5) (at 0 0 0)
+      (property "ki_description" "Four pin crystal, GND on pins 2 and 4" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Crystal*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "D_Schottky_0_1"
+      (symbol "Crystal_GND24_0_1"
+        (rectangle (start -1.143 2.54) (end 1.143 -2.54)
+          (stroke (width 0.3048) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (polyline
           (pts
-            (xy 1.27 0)
-            (xy -1.27 0)
+            (xy -2.54 0)
+            (xy -2.032 0)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 1.27)
-            (xy 1.27 -1.27)
-            (xy -1.27 0)
-            (xy 1.27 1.27)
+            (xy -2.032 -1.27)
+            (xy -2.032 1.27)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.905 0.635)
-            (xy -1.905 1.27)
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
-            (xy -0.635 -1.27)
-            (xy -0.635 -0.635)
+            (xy 0 -3.81)
+            (xy 0 -3.556)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 3.556)
+            (xy 0 3.81)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.032 -1.27)
+            (xy 2.032 1.27)
+          )
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.032 0)
+            (xy 2.54 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 -2.286)
+            (xy -2.54 -3.556)
+            (xy 2.54 -3.556)
+            (xy 2.54 -2.286)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 2.286)
+            (xy -2.54 3.556)
+            (xy 2.54 3.556)
+            (xy 2.54 2.286)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
-      (symbol "D_Schottky_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
-          (name "K" (effects (font (size 1.27 1.27))))
+      (symbol "Crystal_GND24_1_1"
+        (pin passive line (at -3.81 0 0) (length 1.27)
+          (name "1" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 0 5.08 270) (length 1.27)
+          (name "2" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at 3.81 0 180) (length 1.27)
+          (name "3" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -5.08 90) (length 1.27)
+          (name "4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
       )
     )
     (symbol "Device:LED" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
@@ -676,11 +768,11 @@
         )
       )
     )
-    (symbol "Device:Q_NPN_BCE" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (symbol "Device:Q_NPN_BEC" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Q_NPN_BCE" (id 1) (at 5.08 -1.27 0)
+      (property "Value" "Q_NPN_BEC" (id 1) (at 5.08 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 5.08 2.54 0)
@@ -692,10 +784,10 @@
       (property "ki_keywords" "transistor NPN" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "NPN transistor, base/collector/emitter" (id 5) (at 0 0 0)
+      (property "ki_description" "NPN transistor, base/emitter/collector" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Q_NPN_BCE_0_1"
+      (symbol "Q_NPN_BEC_0_1"
         (polyline
           (pts
             (xy 0.635 0.635)
@@ -738,17 +830,17 @@
           (fill (type none))
         )
       )
-      (symbol "Q_NPN_BCE_1_1"
+      (symbol "Q_NPN_BEC_1_1"
         (pin input line (at -5.08 0 0) (length 5.715)
           (name "B" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
         (pin passive line (at 2.54 -5.08 90) (length 2.54)
           (name "E" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54)
+          (name "C" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
       )
@@ -838,6 +930,173 @@
         )
       )
     )
+    (symbol "Diode:BAT54C" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "D" (id 0) (at 0.635 -3.81 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "BAT54C" (id 1) (at -6.35 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 1.905 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "Datasheet" "http://www.diodes.com/_files/datasheets/ds11005.pdf" (id 3) (at -2.032 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "schottky diode common cathode" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "dual schottky barrier diode, common cathode" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "BAT54C_0_1"
+        (polyline
+          (pts
+            (xy -1.905 0)
+            (xy 1.905 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.905 1.27)
+            (xy -1.905 1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.27 -1.27)
+            (xy -0.635 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.27 0)
+            (xy -3.81 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.27 1.27)
+            (xy -1.905 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.27 1.27)
+            (xy -1.27 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -0.635 -1.27)
+            (xy -0.635 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.635 -1.27)
+            (xy 0.635 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 -1.27)
+            (xy 0.635 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 1.27)
+            (xy 1.27 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 1.27)
+            (xy 1.905 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.905 1.27)
+            (xy 1.905 1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 0)
+            (xy 1.27 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.175 -1.27)
+            (xy -3.175 1.27)
+            (xy -1.27 0)
+            (xy -3.175 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.175 -1.27)
+            (xy 3.175 1.27)
+            (xy 1.27 0)
+            (xy 3.175 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 0 0) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+      )
+      (symbol "BAT54C_1_1"
+        (pin passive line (at -7.62 0 0) (length 3.81)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 7.62 0 180) (length 3.81)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -5.08 90) (length 5.08)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "FloatPUMP-rescue:+3.3V-power" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -1451,12 +1710,18 @@
   (junction (at 96.52 73.66) (diameter 0) (color 0 0 0 0)
     (uuid 1b60fcfc-a270-4122-b967-c7c9c4b63403)
   )
+  (junction (at 191.77 41.91) (diameter 0) (color 0 0 0 0)
+    (uuid 1c5a68ea-fed7-43b9-a37a-435ca33d5ec4)
+  )
   (junction (at 133.35 27.305) (diameter 0) (color 0 0 0 0)
     (uuid 2753d945-ace6-4480-9faf-9137856303ea)
   )
   (junction (at 121.92 40.005) (diameter 0) (color 0 0 0 0)
     (uuid 39d0e9d0-a702-4c04-bc3c-653ef4f0c50e)
   )
+  (junction (at 241.3 73.66) (diameter 0) (color 0 0 0 0)
+    (uuid 4cd454dd-343a-4999-b869-a7127a4d9978)
+  )
   (junction (at 121.92 27.305) (diameter 0) (color 0 0 0 0)
     (uuid 4f94cfba-8412-4c60-a31b-e6d995934dc1)
   )
@@ -1472,8 +1737,8 @@
   (junction (at 241.3 78.74) (diameter 0) (color 0 0 0 0)
     (uuid 70750f1a-6a6e-4571-87e8-e96d7814c66f)
   )
-  (junction (at 180.34 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid 7c666a0a-887f-423e-9ba0-dca4ea11728b)
+  (junction (at 201.93 109.855) (diameter 0) (color 0 0 0 0)
+    (uuid 9036384e-eee5-4451-b7e7-87842d0d6fca)
   )
   (junction (at 262.89 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 92a2589f-ae05-42af-aab0-9bfaaa2a73f1)
@@ -1499,12 +1764,12 @@
   (junction (at 245.11 69.85) (diameter 0) (color 0 0 0 0)
     (uuid a783c51a-082f-4856-8a52-660298184bf2)
   )
+  (junction (at 180.34 26.67) (diameter 0) (color 0 0 0 0)
+    (uuid bf64b8d9-04f8-4bac-906b-3f89e12e5d32)
+  )
   (junction (at 201.93 106.68) (diameter 0) (color 0 0 0 0)
     (uuid d85d001d-db06-423e-99e2-d2c9676bf6eb)
   )
-  (junction (at 180.34 26.67) (diameter 0) (color 0 0 0 0)
-    (uuid dac100d6-ad30-4e9f-8f88-f6847fa670b9)
-  )
   (junction (at 106.68 73.66) (diameter 0) (color 0 0 0 0)
     (uuid dbb72415-af02-4b41-adad-978e86e84f5e)
   )
@@ -1523,6 +1788,9 @@
   (junction (at 93.98 172.72) (diameter 0) (color 0 0 0 0)
     (uuid ed19ccea-cfd8-433f-8938-ca1dd302430c)
   )
+  (junction (at 180.34 32.385) (diameter 0) (color 0 0 0 0)
+    (uuid f486435c-c972-42e4-8219-35ab13b3a285)
+  )
   (junction (at 241.3 69.85) (diameter 0) (color 0 0 0 0)
     (uuid f93f0caf-de38-451e-8ca0-f8175bc6663c)
   )
@@ -1564,7 +1832,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0bd2a9c0-96d6-44df-80fd-f97264a8b783)
   )
-  (wire (pts (xy 52.07 104.14) (xy 45.72 104.14))
+  (wire (pts (xy 52.07 104.14) (xy 42.545 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0c6fff14-bb97-4dc3-9f20-62bec77994c6)
   )
@@ -1572,6 +1840,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0e162795-22a7-4501-b03f-b283bb5650d9)
   )
+  (wire (pts (xy 201.93 109.855) (xy 201.93 110.49))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0f47fb04-026a-4afa-9bfe-15f03def5d6b)
+  )
   (wire (pts (xy 149.225 99.06) (xy 163.195 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 126099d8-8b2d-4e87-990f-1fb99894d4b1)
@@ -1630,7 +1902,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1f4d482a-d80d-48b4-a443-e0ca391c4f86)
   )
-  (wire (pts (xy 241.3 69.85) (xy 241.3 78.74))
+  (wire (pts (xy 241.3 69.85) (xy 241.3 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 22a0b2d5-d975-4c12-bf03-7470074fed54)
   )
@@ -1670,7 +1942,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e15e8aa-7905-4170-bb81-958c9c2c74db)
   )
-  (wire (pts (xy 52.07 111.76) (xy 45.72 111.76))
+  (wire (pts (xy 52.07 111.76) (xy 42.545 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e2ea9dc-2e78-48b2-a918-779655a2f4bb)
   )
@@ -1695,7 +1967,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 303ae7a7-4a06-4b35-a5ee-99b6d0ccce36)
   )
-  (wire (pts (xy 33.02 111.76) (xy 38.1 111.76))
+  (wire (pts (xy 33.02 111.76) (xy 34.925 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30c2d75b-0aa4-4c8b-abd3-15a8940150c1)
   )
@@ -1786,6 +2058,10 @@
     (uuid 41b6e1ba-5c99-4fd7-9c65-c4fb07c70188)
   )
 
+  (wire (pts (xy 191.77 41.91) (xy 196.85 41.91))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 424267dd-6303-4018-aae0-34d62814fcba)
+  )
   (wire (pts (xy 99.06 167.64) (xy 99.06 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 424d7750-ddcd-4f41-93ea-a6761834f91c)
@@ -1798,6 +2074,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4390a55c-a8f9-4caf-a838-233bb3ce27aa)
   )
+  (wire (pts (xy 241.3 73.66) (xy 241.3 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 43951137-b2ae-4c0a-b786-c0130baa43cf)
+  )
   (wire (pts (xy 68.58 104.14) (xy 78.74 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 43c49596-4b82-4ee2-b1be-2aafb6486920)
@@ -1839,7 +2119,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d79ec2b-2fc9-4ba1-b93a-d630912470a0)
   )
-  (wire (pts (xy 38.1 104.14) (xy 33.02 104.14))
+  (wire (pts (xy 34.925 104.14) (xy 33.02 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e0ac502-331a-4340-82b9-dd8d8cee49d0)
   )
@@ -1963,7 +2243,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 69502565-c8b7-43eb-99e0-3580594b1098)
   )
-  (wire (pts (xy 201.93 106.68) (xy 201.93 110.49))
+  (wire (pts (xy 201.93 106.68) (xy 201.93 109.855))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 69ab2ff6-8d0a-4e41-8e1a-1caf0870f3b7)
   )
@@ -2028,10 +2308,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78f1b9a8-ca0e-4e8c-91b8-a46bcfebec64)
   )
-  (wire (pts (xy 182.88 41.91) (xy 180.34 41.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7bfe1109-eede-4f99-ba0f-82ee1e6fc27e)
-  )
   (wire (pts (xy 73.66 88.9) (xy 54.61 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c20a18a-318c-4e79-afcf-a3e87eb69a53)
@@ -2048,10 +2324,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 84a2320f-8ad9-4501-8628-7ca6e418f956)
   )
-  (wire (pts (xy 180.34 41.91) (xy 177.8 41.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 867e9c2f-fd02-40e2-83f2-894aeeae770a)
-  )
   (wire (pts (xy 179.07 115.57) (xy 186.69 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 87cf9f49-2322-4621-91eb-11035c4cedf8)
@@ -2193,6 +2465,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a39ab296-84d3-4532-bfd3-0d85d70b622d)
   )
+  (wire (pts (xy 180.34 32.385) (xy 180.34 36.83))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a6b1970e-7fb2-4104-ae0a-e27cd049864d)
+  )
   (wire (pts (xy 78.74 93.98) (xy 76.2 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a89c8429-59bb-42fc-bc75-babaaeef03d9)
@@ -2209,10 +2485,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab6d145b-8b2c-4b78-9fa4-d11fb96ed0e4)
   )
-  (wire (pts (xy 180.34 41.91) (xy 180.34 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ad0f7367-0464-4a74-9eca-58ed55f015f9)
-  )
   (wire (pts (xy 57.15 38.1) (xy 57.15 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid adbff9ca-1914-4369-8ccd-4dec08f28a8e)
@@ -2359,7 +2631,7 @@
     (uuid d3ccf262-928e-4d3c-b7fb-10f0fd24e90c)
   )
 
-  (wire (pts (xy 190.5 41.91) (xy 196.85 41.91))
+  (wire (pts (xy 187.96 41.91) (xy 191.77 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d59d8e3b-ab91-4e44-a48e-fcab5114ba4b)
   )
@@ -2379,6 +2651,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d7be70c0-432e-4886-8aed-aaaf7b3d6873)
   )
+  (wire (pts (xy 57.15 25.4) (xy 57.15 27.94))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dcff3f94-f6a1-46ab-808f-ff344af909cf)
+  )
   (wire (pts (xy 111.76 144.78) (xy 133.35 144.78))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dfa0739b-211d-4ea0-b2c6-5d073248355d)
@@ -2441,10 +2717,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eed5dbbe-9362-46fd-9ec9-8df3ea84b9d9)
   )
-  (wire (pts (xy 57.15 25.4) (xy 57.15 27.94))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid efa0c60e-d5fc-46d2-bfc2-2a5451829e8d)
-  )
   (wire (pts (xy 54.61 67.31) (xy 68.58 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid efff8124-bdab-4cd3-8181-faad1eb27e4f)
@@ -2457,7 +2729,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1c037e2-4968-4b91-93d7-5af5fa892692)
   )
-  (wire (pts (xy 165.1 41.91) (xy 170.18 41.91))
+  (wire (pts (xy 165.1 41.91) (xy 172.72 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f51f9441-4a22-42ba-84ab-b9f70e0bb738)
   )
@@ -2482,6 +2754,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fd5f488f-02dc-45e3-81dd-6ecd42735c1e)
   )
+  (wire (pts (xy 180.34 26.67) (xy 180.34 32.385))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fdadcd65-f9cd-4782-864d-73f050b8fdc6)
+  )
   (wire (pts (xy 78.74 152.4) (xy 60.96 152.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fe800396-56f0-4157-b178-12820e8e71f6)
@@ -2837,6 +3113,9 @@
     (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf" (id 3) (at 96.52 127 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C60420" (id 4) (at 96.52 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 1e766996-f37b-47e8-bc5b-dc9c27f7543f))
     (pin "10" (uuid 7edf752d-2616-45d2-8cb8-4622943246b2))
     (pin "11" (uuid b9a310a3-26bc-429c-a57e-2739e4aaa587))
@@ -2888,49 +3167,60 @@
     (pin "9" (uuid 3fad3fc5-c83f-42ad-9166-fd3507a5a657))
   )
 
-  (symbol (lib_id "Device:Crystal") (at 52.07 107.95 270) (unit 1)
+  (symbol (lib_id "Device:Crystal_GND24") (at 52.07 107.95 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-0000636cbe2d)
-    (property "Reference" "Y1" (id 0) (at 55.245 107.95 90)
+    (property "Reference" "Y1" (id 0) (at 50.8 102.87 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "25MHz 9PF" (id 1) (at 53.975 110.49 90)
+    (property "Value" "25MHz 9PF" (id 1) (at 46.99 113.665 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 52.07 107.95 0)
+    (property "Footprint" "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" (id 2) (at 52.07 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 52.07 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid bfdfbc6f-2ae9-476b-8652-6ecfdee5cc60))
-    (pin "2" (uuid db0462c3-cf7a-43e9-9c6c-8846264afd15))
-  )
-
-  (symbol (lib_id "Device:C") (at 41.91 104.14 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-0000636d2cc5)
-    (property "Reference" "C2" (id 0) (at 44.45 100.965 90))
-    (property "Value" "12pF" (id 1) (at 45.72 102.87 90))
-    (property "Footprint" "" (id 2) (at 38.1 105.1052 0)
+    (property "JLCPCB" "C2149073" (id 4) (at 52.07 107.95 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 41.91 104.14 0)
+    (pin "1" (uuid bfdfbc6f-2ae9-476b-8652-6ecfdee5cc60))
+    (pin "2" (uuid db0462c3-cf7a-43e9-9c6c-8846264afd15))
+    (pin "3" (uuid ca3adf4d-c267-4527-8c07-520983c37264))
+    (pin "4" (uuid 5acdcbb8-46d5-4b54-bff3-7fc8b1b35545))
+  )
+
+  (symbol (lib_id "Device:C") (at 38.735 104.14 270) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-0000636d2cc5)
+    (property "Reference" "C2" (id 0) (at 41.275 100.965 90))
+    (property "Value" "12pF" (id 1) (at 42.545 102.87 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 34.925 105.1052 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 38.735 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C165738" (id 4) (at 38.735 104.14 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7e06312e-c115-4b9f-91cc-5b3f9e5d9965))
     (pin "2" (uuid 3c2fe3fb-73a3-417b-b1d9-201ce17dbbd4))
   )
 
-  (symbol (lib_id "Device:C") (at 41.91 111.76 270) (unit 1)
+  (symbol (lib_id "Device:C") (at 38.735 111.76 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-0000636d36f6)
-    (property "Reference" "C3" (id 0) (at 44.45 108.585 90))
-    (property "Value" "12pF" (id 1) (at 45.72 110.49 90))
-    (property "Footprint" "" (id 2) (at 38.1 112.7252 0)
+    (property "Reference" "C3" (id 0) (at 41.275 108.585 90))
+    (property "Value" "12pF" (id 1) (at 42.545 110.49 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 34.925 112.7252 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 41.91 111.76 0)
+    (property "Datasheet" "~" (id 3) (at 38.735 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C165738" (id 4) (at 38.735 111.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6572d2ed-52a5-46a0-9c79-1a476cd9a140))
@@ -2946,12 +3236,15 @@
     (property "Value" "32.768kHz 6pF" (id 1) (at 47.625 128.27 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 52.07 123.19 0)
+    (property "Footprint" "Crystal:Crystal_SMD_2012-2Pin_2.0x1.2mm" (id 2) (at 52.07 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 52.07 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C255767" (id 4) (at 52.07 123.19 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid edbad2c4-6ce5-4747-a63c-918f50234cc1))
     (pin "2" (uuid 1da429a1-6161-4b65-af92-9d919c11fe09))
   )
@@ -2961,12 +3254,15 @@
     (uuid 00000000-0000-0000-0000-0000636dd6bb)
     (property "Reference" "C4" (id 0) (at 44.45 116.205 90))
     (property "Value" "4.3pF" (id 1) (at 45.72 118.11 90))
-    (property "Footprint" "" (id 2) (at 38.1 120.3452 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 38.1 120.3452 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 41.91 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C376790" (id 4) (at 41.91 119.38 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid d032fa21-648f-4ea7-b31e-aaed9ca8e17e))
     (pin "2" (uuid 2f3e5136-66f1-4a15-83fb-c298bcc30373))
   )
@@ -2976,12 +3272,15 @@
     (uuid 00000000-0000-0000-0000-0000636dd6c1)
     (property "Reference" "C5" (id 0) (at 44.45 123.825 90))
     (property "Value" "4.3pF" (id 1) (at 45.72 125.73 90))
-    (property "Footprint" "" (id 2) (at 38.1 127.9652 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 38.1 127.9652 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 41.91 127 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C376790" (id 4) (at 41.91 127 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid a88f4420-5ca7-4514-a2cb-7dbd358dab26))
     (pin "2" (uuid 71a36099-aeed-43ee-ad24-806db39d50de))
   )
@@ -3080,12 +3379,15 @@
     (uuid 00000000-0000-0000-0000-0000636e33c9)
     (property "Reference" "C1" (id 0) (at 41.91 86.3092 90))
     (property "Value" "4.7uF" (id 1) (at 41.91 88.6206 90))
-    (property "Footprint" "" (id 2) (at 38.1 93.6752 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 38.1 93.6752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 41.91 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" " C152896 " (id 4) (at 41.91 92.71 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid ba444daa-f8e3-4e86-96f3-38b7594dde84))
     (pin "2" (uuid e96c1c89-971b-4d76-a348-1f72d6d65d59))
   )
@@ -3183,12 +3485,15 @@
     (property "Value" "100nF" (id 1) (at 109.601 81.153 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 107.6452 83.82 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 107.6452 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 106.68 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C88219" (id 4) (at 106.68 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 12aca2bf-24d0-43dd-86d3-e1f91cdba204))
     (pin "2" (uuid 86019d2d-7e25-4366-b47c-90d10d237c73))
   )
@@ -3202,12 +3507,15 @@
     (property "Value" "100nF" (id 1) (at 113.411 34.798 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 111.4552 37.465 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 111.4552 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 110.49 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C88219" (id 4) (at 110.49 33.655 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 46f5d72e-1ec6-4bbc-8285-b243015d7f9e))
     (pin "2" (uuid 145046ad-238b-47cb-8dd4-4cb3ed726878))
   )
@@ -3221,12 +3529,15 @@
     (property "Value" "100nF" (id 1) (at 124.841 34.798 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 122.8852 37.465 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 122.8852 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 121.92 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C88219" (id 4) (at 121.92 33.655 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 69dd86d4-743e-474c-a9da-14c9c90c0493))
     (pin "2" (uuid e8c2a120-a370-4378-a409-285679c243eb))
   )
@@ -3240,12 +3551,15 @@
     (property "Value" "100nF" (id 1) (at 136.271 34.798 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 134.3152 37.465 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 134.3152 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C88219" (id 4) (at 133.35 33.655 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 04e7915d-a72d-4f49-82d6-1de3a4cddd7d))
     (pin "2" (uuid d06da3ab-55a9-4c83-8996-0ed3e90b4db7))
   )
@@ -3323,7 +3637,7 @@
     (property "Value" "Jmp_Flash" (id 1) (at 210.7692 67.183 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 208.28 66.04 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 208.28 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 66.04 0)
@@ -3390,12 +3704,15 @@
     (property "Value" "10k" (id 1) (at 210.058 77.343 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 206.502 76.2 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 206.502 76.2 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C238881" (id 4) (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 64d02eff-d487-4ba3-a9de-f66b366ddc51))
     (pin "2" (uuid 405a812b-0030-40bb-a38d-2e15fce63ade))
   )
@@ -3405,44 +3722,35 @@
     (uuid 00000000-0000-0000-0000-0000637113ba)
     (property "Reference" "SW1" (id 0) (at 251.46 65.405 0))
     (property "Value" "Btn_Reset" (id 1) (at 251.46 73.66 0))
-    (property "Footprint" "" (id 2) (at 251.46 64.77 0)
+    (property "Footprint" "Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5mm" (id 2) (at 251.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "http://www.apem.com/int/index.php?controller=attachment&id_attachment=1371" (id 3) (at 251.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C271750" (id 4) (at 251.46 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 4ca0eb5a-ac6c-4f15-8da4-519128656862))
     (pin "2" (uuid 66ab84b3-c6e7-4efd-bbe6-19b034b43812))
     (pin "3" (uuid 7c3274d5-c4f8-46a5-bd07-9c3a657c3894))
     (pin "4" (uuid 7e5477ef-2d82-4241-8190-7caf57a2e977))
   )
 
-  (symbol (lib_id "Device:C") (at 251.46 82.55 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000063714ee7)
-    (property "Reference" "C12" (id 0) (at 251.46 76.1492 90))
-    (property "Value" "100nF" (id 1) (at 251.46 78.4606 90))
-    (property "Footprint" "" (id 2) (at 247.65 83.5152 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 251.46 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 9741ecc9-7f7e-4134-907f-0cfe610b12f2))
-    (pin "2" (uuid e4b0fded-b174-4415-b2ab-1b0da4cbddf8))
-  )
-
   (symbol (lib_id "FloatPUMP-rescue:Ferrite_Bead-Device") (at 119.38 73.66 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00006371a3c4)
     (property "Reference" "FB1" (id 0) (at 119.38 66.7004 90))
-    (property "Value" "Ferrite_Bead" (id 1) (at 119.38 69.0118 90))
-    (property "Footprint" "" (id 2) (at 119.38 71.882 90)
+    (property "Value" "1.5A 90m" (id 1) (at 119.38 69.0118 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 119.38 71.882 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 119.38 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C82850" (id 4) (at 119.38 73.66 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid fb8120c9-acef-4e9b-a4ef-fa9c8e32f1cc))
     (pin "2" (uuid ef963702-e568-4e31-abfd-8d5e5f2cbbf7))
   )
@@ -3456,7 +3764,7 @@
     (property "Value" "nc" (id 1) (at 243.078 64.643 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 239.522 63.5 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 239.522 63.5 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 241.3 63.5 0)
@@ -3491,12 +3799,15 @@
     (property "Value" "1.0uF" (id 1) (at 148.336 34.798 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 146.3802 37.465 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 146.3802 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 145.415 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C108343" (id 4) (at 145.415 33.655 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid f349211b-c6b5-4302-a0d9-7ba8026ba243))
     (pin "2" (uuid dc2e7785-d1fe-46f7-8a4d-0246a37f1dcd))
   )
@@ -3519,47 +3830,20 @@
     (pin "1" (uuid 4652c461-21b4-4e7a-8eda-b5d76d789468))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 173.99 41.91 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00006373bde2)
-    (property "Reference" "D4" (id 0) (at 173.99 36.3982 0))
-    (property "Value" "D_Schottky" (id 1) (at 173.99 38.7096 0))
-    (property "Footprint" "" (id 2) (at 173.99 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 173.99 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7d89827f-778c-494d-8465-a12ef79ae0fd))
-    (pin "2" (uuid ac5021fd-3d31-4759-9d34-d559d1c15d73))
-  )
-
-  (symbol (lib_id "Device:D_Schottky") (at 186.69 41.91 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00006373cd65)
-    (property "Reference" "D5" (id 0) (at 186.69 36.3982 0))
-    (property "Value" "D_Schottky" (id 1) (at 186.69 38.7096 0))
-    (property "Footprint" "" (id 2) (at 186.69 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 186.69 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 75b1ca66-58f9-49c9-9d6c-b7d40323ae0d))
-    (pin "2" (uuid 042579d0-6a37-439c-8dff-d670600479b1))
-  )
-
   (symbol (lib_id "Device:C") (at 184.15 26.67 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00006374346b)
     (property "Reference" "C11" (id 0) (at 184.15 20.2692 90))
     (property "Value" "100nF" (id 1) (at 184.15 22.5806 90))
-    (property "Footprint" "" (id 2) (at 187.96 25.7048 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 187.96 25.7048 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 184.15 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C88219" (id 4) (at 184.15 26.67 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid d8aa61f2-dbd1-4829-8621-7d241105a00d))
     (pin "2" (uuid 88218ba4-2ffc-4a63-b67a-7f50506a4240))
   )
@@ -3600,55 +3884,122 @@
     (pin "1" (uuid 2be55040-8baf-4570-b921-a93c1a09d7b2))
   )
 
+  (symbol (lib_id "power:GND") (at 46.99 107.95 270) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0200986f-30d7-4d07-9ff9-bfa16084b449)
+    (property "Reference" "#PWR0101" (id 0) (at 40.64 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 45.085 106.68 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 46.99 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 46.99 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6eaeff86-9de0-4081-835a-cad48fb0beff))
+  )
+
+  (symbol (lib_id "Device:R") (at 160.655 112.395 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 0daebaab-ebf9-4c26-9a90-afd951c097eb)
+    (property "Reference" "R8" (id 0) (at 162.433 111.5603 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "R" (id 1) (at 162.433 114.0972 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 158.877 112.395 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 160.655 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 160.655 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 37470ea0-3b22-4e90-9600-46145bd66beb))
+    (pin "2" (uuid 75c1af3c-5a0f-4fa8-91f1-ee7c35d49716))
+  )
+
   (symbol (lib_id "Device:R") (at 190.5 115.57 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1352f09b-a902-46e1-9d87-17d89dff3309)
     (property "Reference" "R9" (id 0) (at 190.5 110.8542 90))
     (property "Value" "1k" (id 1) (at 190.5 113.3911 90))
-    (property "Footprint" "" (id 2) (at 190.5 117.348 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 190.5 117.348 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 190.5 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C328340" (id 4) (at 190.5 115.57 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid e186b327-0a0b-4551-ba39-096d50105552))
     (pin "2" (uuid 34913334-dcfe-41b2-9cd5-c8359bf339a2))
   )
 
-  (symbol (lib_id "Device:R") (at 41.91 156.21 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 191.77 41.91 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 17c769b2-fbc4-492b-9289-6780fc4b3fee)
-    (property "Reference" "R3" (id 0) (at 43.688 155.3753 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 1cdf60ae-3395-466a-9976-fe37458b71c6)
+    (property "Reference" "TP?" (id 0) (at 193.167 44.3773 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "R" (id 1) (at 43.688 157.9122 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "TestPoint_Alt" (id 1) (at 193.167 46.9142 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 40.132 156.21 90)
+    (property "Footprint" "" (id 2) (at 186.69 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 41.91 156.21 0)
+    (property "Datasheet" "~" (id 3) (at 186.69 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1a37ce6a-2042-42de-a04a-744d5982ba5d))
-    (pin "2" (uuid 3ed25b47-b0b7-47de-81b9-05ea4525ce1a))
+    (pin "1" (uuid c630b842-9a8f-4a82-99bd-b7018a3a8334))
+  )
+
+  (symbol (lib_id "Device:C") (at 251.46 82.55 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 1d978657-b84f-4964-b6ac-fcf819db3d10)
+    (property "Reference" "C12" (id 0) (at 252.73 78.74 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "100nF" (id 1) (at 254.635 86.36 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 255.27 81.5848 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 251.46 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C88219" (id 4) (at 251.46 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 320ff842-f7c3-46e1-aa41-5a8d2554c29f))
+    (pin "2" (uuid b2755f35-9f24-48f8-931d-d21a17100461))
   )
 
   (symbol (lib_id "Device:LED") (at 41.91 146.685 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes)
     (uuid 34f8d18b-20b4-419c-ac92-810450c3b76f)
     (property "Reference" "D3" (id 0) (at 44.831 147.4378 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (id 1) (at 44.831 149.9747 90)
+    (property "Value" "BLUE" (id 1) (at 44.45 150.495 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 41.91 146.685 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 41.91 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 41.91 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" " C94613 " (id 4) (at 41.91 146.685 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 9c4f9b1a-d168-4504-adb6-22a17b88b58d))
     (pin "2" (uuid c1d7ef26-6ea3-46b9-b7bb-4f1a7bbf4769))
   )
@@ -3678,17 +4029,38 @@
     (property "Value" "10k" (id 1) (at 95.758 30.2772 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 92.202 28.575 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 92.202 28.575 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C238881" (id 4) (at 93.98 28.575 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid ad63920e-6362-4a6e-ab0f-f7fe3e502090))
     (pin "2" (uuid 3fabe9ba-8d91-44e8-a02d-096a51e8952e))
   )
 
-  (symbol (lib_id "Device:Q_NPN_BCE") (at 199.39 115.57 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 59.69 30.48 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 3e5d86e2-adab-421f-bd51-f3d3873663e7)
+    (property "Reference" "TP?" (id 0) (at 64.389 29.6453 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 64.389 32.1822 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 59.69 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 59.69 35.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid dbec6a3a-571a-4ec9-b84b-da37fe804961))
+  )
+
+  (symbol (lib_id "Device:Q_NPN_BEC") (at 199.39 115.57 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 45a15488-24e9-4cab-b892-2575ecf9e908)
     (property "Reference" "Q1" (id 0) (at 204.2414 114.7353 0)
@@ -3697,7 +4069,7 @@
     (property "Value" "Q_NPN_BCE" (id 1) (at 204.2414 117.2722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 204.47 113.03 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 204.47 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 199.39 115.57 0)
@@ -3708,25 +4080,6 @@
     (pin "3" (uuid b5839159-f516-4407-ad81-6aa7561c7413))
   )
 
-  (symbol (lib_id "Device:R") (at 156.21 112.395 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 48c2626c-99bd-4c94-92f8-221166379f14)
-    (property "Reference" "R7" (id 0) (at 157.988 111.5603 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "R" (id 1) (at 157.988 114.0972 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 154.432 112.395 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 156.21 112.395 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6a962b3b-7cec-46c0-bb5c-8ebfa4236d67))
-    (pin "2" (uuid 12723f14-d116-4a57-b8b6-3b46a195114f))
-  )
-
   (symbol (lib_id "Device:R") (at 100.33 31.115 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4bb60ce8-0a8b-4620-8fc9-8d5ff7370c3e)
@@ -3736,12 +4089,15 @@
     (property "Value" "10k" (id 1) (at 102.108 32.8172 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 98.552 31.115 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 98.552 31.115 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 100.33 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C238881" (id 4) (at 100.33 31.115 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid e574917a-1712-4090-8335-005e71063b62))
     (pin "2" (uuid 45c6401e-ddd7-4272-b761-4e698c294033))
   )
@@ -3764,25 +4120,6 @@
     (pin "5" (uuid ce33a596-2260-430a-9c76-46ad5cecf5c9))
   )
 
-  (symbol (lib_id "Device:R") (at 33.02 156.21 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5980fcdf-dedc-4b1d-b59c-ef12b1806c05)
-    (property "Reference" "R2" (id 0) (at 34.798 155.3753 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "R" (id 1) (at 34.798 157.9122 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 31.242 156.21 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 33.02 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a7a07355-7fec-49b4-8425-00d9b73d32f4))
-    (pin "2" (uuid d77f8f14-0f22-4212-b815-45b2f5ff6b8b))
-  )
-
   (symbol (lib_id "power:+5V") (at 93.98 23.495 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 59c22d94-6e56-44bb-9a5b-b75cba851c78)
@@ -3815,6 +4152,101 @@
     (pin "1" (uuid 1726bfde-35bd-4007-a502-1609744f3d12))
   )
 
+  (symbol (lib_id "power:GND") (at 57.15 107.95 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6514d177-0292-4906-afd6-cb52d1745d2b)
+    (property "Reference" "#PWR0102" (id 0) (at 63.5 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 59.055 109.855 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 57.15 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 57.15 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e0c2cd67-6eb9-45d1-a260-3b9f85dff2f3))
+  )
+
+  (symbol (lib_id "Diode:BAT54C") (at 180.34 41.91 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 66747d47-0870-4b4b-8e7a-d05b1dcf0d6e)
+    (property "Reference" "D4" (id 0) (at 180.34 45.0834 0))
+    (property "Value" "BAT54C" (id 1) (at 180.34 47.6203 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 182.245 45.085 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1811141223_Nexperia-BAT54C-215_C37704.pdf" (id 3) (at 178.308 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C37704" (id 4) (at 180.34 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bf5af104-7899-419f-be3f-988fbfa8a5c9))
+    (pin "2" (uuid 287dfcf6-9323-4a82-b3cb-ed98d08b726c))
+    (pin "3" (uuid 1cb65039-98d2-4475-9b35-3273ab21a2ab))
+  )
+
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 241.3 73.66 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 71292fa8-7596-4655-9fd7-9007176e2b74)
+    (property "Reference" "TP?" (id 0) (at 237.998 69.3252 90))
+    (property "Value" "TestPoint_Alt" (id 1) (at 237.998 71.8621 90))
+    (property "Footprint" "" (id 2) (at 241.3 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 241.3 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4a81b7b8-fd4e-4599-b894-a7e0f1afcc71))
+  )
+
+  (symbol (lib_id "Device:R") (at 156.21 112.395 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 75a7de8e-60cc-416a-ba9e-f874351f540c)
+    (property "Reference" "R7" (id 0) (at 157.988 111.5603 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "R" (id 1) (at 157.988 114.0972 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 154.432 112.395 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 156.21 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 156.21 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 14cf3c28-b6e9-4e85-824e-c716b1c58cd7))
+    (pin "2" (uuid 684f3962-454d-4f29-9c54-8ed7291d3f00))
+  )
+
+  (symbol (lib_id "Device:R") (at 33.02 156.21 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 817e25a2-8673-40b2-be1c-18b259a1fe22)
+    (property "Reference" "R2" (id 0) (at 34.798 155.3753 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "R" (id 1) (at 34.798 157.9122 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 31.242 156.21 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 33.02 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 33.02 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e3afb2c7-7081-4988-8dd4-29f3453a69bd))
+    (pin "2" (uuid 96dd00e1-4f4e-49c8-ad42-17290a3d01d8))
+  )
+
   (symbol (lib_id "power:GND") (at 227.33 41.91 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 82ef9454-a4eb-4ea0-bdd6-e25903ed3836)
@@ -3850,25 +4282,6 @@
     (pin "2" (uuid a6d6b9ea-01fd-48e9-9c5b-41bc79786ee0))
   )
 
-  (symbol (lib_id "Device:R") (at 160.655 112.395 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 882dcdc2-0b9f-4811-8bef-6134d8680957)
-    (property "Reference" "R8" (id 0) (at 162.433 111.5603 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "R" (id 1) (at 162.433 114.0972 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 158.877 112.395 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 160.655 112.395 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d8255bfb-5f1b-49a0-a915-f806f49560e3))
-    (pin "2" (uuid f07a965a-559d-405b-bf54-63151fd58277))
-  )
-
   (symbol (lib_id "power:+3.3V") (at 149.225 96.52 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 893667a9-872d-491b-bf81-3642ad137714)
@@ -3891,10 +4304,10 @@
     (property "Reference" "R10" (id 0) (at 203.708 102.0353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 203.708 104.5722 0)
+    (property "Value" "nc" (id 1) (at 203.708 104.5722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 200.152 102.87 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 200.152 102.87 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 201.93 102.87 0)
@@ -3926,19 +4339,40 @@
     (property "Reference" "D2" (id 0) (at 35.941 147.4378 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (id 1) (at 37.211 149.9747 90)
+    (property "Value" "GREEN" (id 1) (at 35.56 150.495 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 33.02 146.685 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 33.02 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 33.02 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C264433" (id 4) (at 33.02 146.685 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 00785063-b50c-4a7b-83eb-71057dfdcc29))
     (pin "2" (uuid a743ebfe-b732-4226-88dc-83f710ce73b8))
   )
 
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 59.69 33.02 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 91a2f4d4-05ca-4c1d-aca0-03abf45c23ed)
+    (property "Reference" "TP?" (id 0) (at 64.389 32.1853 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 64.389 34.7222 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 59.69 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 59.69 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 75646733-402f-41fc-9657-d3939049ecc8))
+  )
+
   (symbol (lib_id "power:+5V") (at 201.93 95.25 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2b8da2a-bdaa-4cab-b745-17ededf37ae2)
@@ -3955,6 +4389,64 @@
     (pin "1" (uuid 981ff66f-cd9d-44ee-b5fc-da69f787caf0))
   )
 
+  (symbol (lib_id "Device:R") (at 41.91 156.21 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a2d94e6d-c8db-4d4d-82c0-66eb9282228d)
+    (property "Reference" "R3" (id 0) (at 43.688 155.3753 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "R" (id 1) (at 43.688 157.9122 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 40.132 156.21 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 41.91 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 41.91 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a156fb5d-de6a-4517-83ff-142c182c4f4c))
+    (pin "2" (uuid 59b7d16c-4bda-49f1-8162-9098b939607f))
+  )
+
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 201.93 109.855 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a2f48f1d-5326-4de1-bfab-85e43ac66072)
+    (property "Reference" "TP?" (id 0) (at 206.629 109.0203 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 206.629 111.5572 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 201.93 114.935 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 201.93 114.935 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fdaca1f6-4635-4545-8342-7a3c1faf06c8))
+  )
+
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 180.34 32.385 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b055e194-0749-48b4-9b7f-f65fad0e2fde)
+    (property "Reference" "TP?" (id 0) (at 185.039 31.5503 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 185.039 34.0872 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 180.34 37.465 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 180.34 37.465 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 972ce9be-b40e-42cd-b4ae-bb8454aa1d52))
+  )
+
   (symbol (lib_id "power:GND") (at 201.93 120.65 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b1402c9d-c864-487e-9cfe-9ade6d06086a)
@@ -3993,15 +4485,18 @@
     (property "Reference" "D1" (id 0) (at 26.416 147.4378 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (id 1) (at 26.416 149.9747 90)
+    (property "Value" "RED" (id 1) (at 26.416 149.9747 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 23.495 146.685 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 23.495 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 23.495 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C94614" (id 4) (at 23.495 146.685 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid dbe3973a-962b-4874-924d-3fdf86a61c10))
     (pin "2" (uuid ecb02c2d-379c-4d1a-9e85-290a5e2d44f8))
   )
@@ -4041,6 +4536,24 @@
     (pin "2" (uuid 5cba1b3c-5731-45f5-93c8-29c672969214))
   )
 
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 208.28 71.12 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid d010d1c6-7a54-4e13-9847-1ec25700d434)
+    (property "Reference" "TP?" (id 0) (at 212.979 70.2853 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 212.979 72.8222 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f1d94e80-5d7b-4949-85bc-0beff745ae1f))
+  )
+
   (symbol (lib_id "power:GND") (at 86.36 40.64 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d934cf79-cf3d-47c9-9aab-cba700d2c2d5)
@@ -4057,6 +4570,28 @@
     (pin "1" (uuid 08fb4a6c-117d-4416-be59-77d56a7ed270))
   )
 
+  (symbol (lib_id "Device:R") (at 151.765 112.395 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid da0e8533-f332-4691-b7dc-3ef13d4aa486)
+    (property "Reference" "R6" (id 0) (at 153.543 111.5603 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "R" (id 1) (at 153.543 114.0972 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 149.987 112.395 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 151.765 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 151.765 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1802b0ce-2b2b-43bc-a715-270df204991e))
+    (pin "2" (uuid e7da9579-ae26-4830-95c2-d200dbe1b26f))
+  )
+
   (symbol (lib_id "Connector:Conn_01x04_Male") (at 68.58 33.02 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e0734560-d1a8-4be6-9aee-85a68ea29234)
@@ -4144,6 +4679,24 @@
     (pin "1" (uuid 603a32b1-e939-4051-8225-fa2a068099b0))
   )
 
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 59.69 35.56 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e7eee0ee-46c0-45f5-aaf3-8b3e6c2e1e3c)
+    (property "Reference" "TP?" (id 0) (at 64.389 34.7253 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 64.389 37.2622 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 59.69 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 59.69 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3822a2c5-ecdd-400e-b247-4f689c7b21c4))
+  )
+
   (symbol (lib_id "Device:R") (at 23.495 156.21 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f303ef76-d27a-409e-8075-e8c01dcd1ea2)
@@ -4153,35 +4706,19 @@
     (property "Value" "R" (id 1) (at 25.273 157.9122 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 21.717 156.21 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 21.717 156.21 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 23.495 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C328340" (id 4) (at 23.495 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 836ec77a-a552-461b-a9f7-d34a696a8322))
     (pin "2" (uuid 014a3421-01d7-44c3-9cbb-c137fdcf24da))
   )
 
-  (symbol (lib_id "Device:R") (at 151.765 112.395 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid fc842231-725d-4498-bc7e-56f875188a79)
-    (property "Reference" "R6" (id 0) (at 153.543 111.5603 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "R" (id 1) (at 153.543 114.0972 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 149.987 112.395 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 151.765 112.395 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 52ce58f0-1d47-461c-b418-b79081a61376))
-    (pin "2" (uuid 31c15a4c-4c8d-40a1-95a6-39842b34c66f))
-  )
-
   (sheet (at 181.61 138.43) (size 31.75 20.32) (fields_autoplaced)
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
@@ -4495,15 +5032,9 @@
     (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/0b332ae8-8af3-43a3-95a2-d7f2823277e2"
       (reference "#PWR063") (unit 1) (value "GND") (footprint "")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/2c661355-004a-4aad-bcd6-6fbfb96749d2"
-      (reference "#PWR064") (unit 1) (value "GND") (footprint "")
-    )
     (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/0545d7ec-9cad-4552-afb9-35b04ed431b9"
       (reference "#PWR065") (unit 1) (value "+24V") (footprint "")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/6d40a308-0373-4a4e-a518-5cfa4a688487"
-      (reference "#PWR066") (unit 1) (value "GND") (footprint "")
-    )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/1765e79a-e73c-4fee-98df-4a2b8a88bfae"
       (reference "#PWR067") (unit 1) (value "GND") (footprint "")
     )
@@ -4513,119 +5044,128 @@
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/4ca0e901-3126-4e44-8118-286b3ef83fa3"
       (reference "#PWR069") (unit 1) (value "GND") (footprint "")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/23c61aba-ac88-4ecf-a45d-ff481a634acb"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/3daba886-f922-4d7a-b618-d4db473bb2d4"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/9b735c5d-05c6-47d6-afc9-23d72572fbb9"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/c2453f31-8f9a-4ea8-9496-9cf5b4b88b5a"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+      (reference "#PWR071") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/0200986f-30d7-4d07-9ff9-bfa16084b449"
+      (reference "#PWR0101") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6514d177-0292-4906-afd6-cb52d1745d2b"
+      (reference "#PWR0102") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/f94cb857-0ce7-4265-a54e-7837b8e1be65"
+      (reference "#PWR0103") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/6634c0d6-74ea-4897-bb5d-27da957caba1"
+      (reference "#PWR0104") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/c322b716-5e7e-4567-b76f-f812077f2500"
+      (reference "#PWR0105") (unit 1) (value "+3.3V") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/62d108a1-1468-4dfb-906f-f388e3162ca5"
+      (reference "#PWR0106") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/9b22e1ab-8212-4435-9b7a-2b32442ce4c5"
+      (reference "#PWR0107") (unit 1) (value "+3.3V") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/69a8a82f-daa7-4ac0-ab39-aa3a6c7ed206"
+      (reference "#PWR0108") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/678ac74d-3939-4210-af63-200a75e4bd3c"
+      (reference "#PWR0109") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/7efa97ff-aa1a-4469-81cc-a9013bc9bf87"
+      (reference "#PWR0110") (unit 1) (value "+3.3V") (footprint "")
     )
     (path "/84c3cc10-c200-4c12-9784-27d9064531f0"
       (reference "BT1") (unit 1) (value "Battery_Cell") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000636e33c9"
-      (reference "C1") (unit 1) (value "4.7uF") (footprint "")
+      (reference "C1") (unit 1) (value "4.7uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636d2cc5"
-      (reference "C2") (unit 1) (value "12pF") (footprint "")
+      (reference "C2") (unit 1) (value "12pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636d36f6"
-      (reference "C3") (unit 1) (value "12pF") (footprint "")
+      (reference "C3") (unit 1) (value "12pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636dd6bb"
-      (reference "C4") (unit 1) (value "4.3pF") (footprint "")
+      (reference "C4") (unit 1) (value "4.3pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636dd6c1"
-      (reference "C5") (unit 1) (value "4.3pF") (footprint "")
+      (reference "C5") (unit 1) (value "4.3pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636f02fc"
-      (reference "C6") (unit 1) (value "100nF") (footprint "")
+      (reference "C6") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636f1d17"
-      (reference "C7") (unit 1) (value "100nF") (footprint "")
+      (reference "C7") (unit 1) (value "100nF") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636f24b5"
-      (reference "C8") (unit 1) (value "100nF") (footprint "")
+      (reference "C8") (unit 1) (value "100nF") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000636f2f40"
-      (reference "C9") (unit 1) (value "100nF") (footprint "")
+      (reference "C9") (unit 1) (value "100nF") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-000063722118"
-      (reference "C10") (unit 1) (value "1.0uF") (footprint "")
+      (reference "C10") (unit 1) (value "1.0uF") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00006374346b"
-      (reference "C11") (unit 1) (value "100nF") (footprint "")
+      (reference "C11") (unit 1) (value "100nF") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/00000000-0000-0000-0000-000063714ee7"
-      (reference "C12") (unit 1) (value "100nF") (footprint "")
+    (path "/1d978657-b84f-4964-b6ac-fcf819db3d10"
+      (reference "C12") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/bd12be67-587a-426e-9dd6-5f4ff0b013bc"
-      (reference "D1") (unit 1) (value "LED") (footprint "")
+      (reference "D1") (unit 1) (value "RED") (footprint "LED_SMD:LED_0805_2012Metric")
     )
     (path "/904646a5-77a8-4d57-9bd3-2dc32a67b43c"
-      (reference "D2") (unit 1) (value "LED") (footprint "")
+      (reference "D2") (unit 1) (value "GREEN") (footprint "LED_SMD:LED_0805_2012Metric")
     )
     (path "/34f8d18b-20b4-419c-ac92-810450c3b76f"
-      (reference "D3") (unit 1) (value "LED") (footprint "")
+      (reference "D3") (unit 1) (value "BLUE") (footprint "LED_SMD:LED_0805_2012Metric")
     )
-    (path "/00000000-0000-0000-0000-00006373bde2"
-      (reference "D4") (unit 1) (value "D_Schottky") (footprint "")
+    (path "/66747d47-0870-4b4b-8e7a-d05b1dcf0d6e"
+      (reference "D4") (unit 1) (value "BAT54C") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-00006373cd65"
-      (reference "D5") (unit 1) (value "D_Schottky") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/5cee2b56-faec-46ca-a30e-95c12581d89e"
+      (reference "D5") (unit 1) (value "D") (footprint "Diode_SMD:D_SMA")
     )
     (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/7ac9d2f2-8ac0-41d3-9148-76d5b4b26a81"
-      (reference "D6") (unit 1) (value "LED") (footprint "")
+      (reference "D6") (unit 1) (value "LED") (footprint "LED_SMD:LED_0805_2012Metric")
     )
     (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/365f756e-8202-4285-9846-eccbb1392d36"
-      (reference "D7") (unit 1) (value "D") (footprint "")
+      (reference "D7") (unit 1) (value "D") (footprint "Diode_SMD:D_SMA")
     )
     (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/61694e91-4168-4c8f-b51f-fc549ac4a37e"
-      (reference "D8") (unit 1) (value "LED") (footprint "")
+      (reference "D8") (unit 1) (value "LED") (footprint "LED_SMD:LED_0805_2012Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/d366181a-ea7c-4d9b-978f-206ef0feccbe"
-      (reference "D9") (unit 1) (value "D") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/2ced2b81-6ead-4d2f-876b-e2b734b0ea86"
+      (reference "D9") (unit 1) (value "D") (footprint "Diode_SMD:D_SMA")
     )
     (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/684d64ad-997c-4fbd-82ab-fb11666db4f5"
-      (reference "D10") (unit 1) (value "LED") (footprint "")
+      (reference "D10") (unit 1) (value "LED") (footprint "LED_SMD:LED_0805_2012Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/93d28f2f-7c53-4174-abf5-99ae6c642e9e"
-      (reference "D11") (unit 1) (value "D") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/aecc2cb9-41b9-45be-95ae-71f4428d7e61"
+      (reference "D12") (unit 1) (value "BAT54S") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/98d0a2c4-9242-4a08-9fd6-c4db12d4f787"
-      (reference "D12") (unit 1) (value "D_Schottky") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/40b28f98-2128-4d2f-9da4-6c39e881cbdf"
+      (reference "D13") (unit 1) (value "D_3.3V") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/7dd6e74d-fda7-42d8-ba93-5bfb39ee8417"
-      (reference "D13") (unit 1) (value "3.3V") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/6cb5d89c-6d57-45c5-84a2-acae7e66daf5"
+      (reference "D14") (unit 1) (value "BAT54S") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/826d0e3f-f830-4cee-9e41-c8f156726f0e"
-      (reference "D14") (unit 1) (value "D_Schottky") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/8f3790e3-989c-424a-ba9e-be38f8a3d3f9"
+      (reference "D15") (unit 1) (value "D_3.3V") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/67628182-0947-4e48-a0b8-814d153031bf"
-      (reference "D15") (unit 1) (value "3.3V") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/4ab00a4c-694d-46d3-b3d0-bb46287df2d1"
+      (reference "D16") (unit 1) (value "BAT54S") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/0b6e6641-1a47-44b3-88e7-30c3217925c1"
-      (reference "D16") (unit 1) (value "D_Schottky") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/5d282cb1-4b66-47fa-8cbd-cd6204e38a41"
-      (reference "D17") (unit 1) (value "3.3V") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/1b7ac5b8-bd9e-4cd6-901f-1d049ab25dff"
-      (reference "D?") (unit 1) (value "D_Schottky") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/1ea2f135-9ec2-4f4d-a0fb-63badacb693d"
-      (reference "D?") (unit 1) (value "D_Schottky") (footprint "")
-    )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/71f15a40-0fa6-4e12-9551-dd6d01863870"
-      (reference "D?") (unit 1) (value "D_Schottky") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/1b7ebed8-1682-4f6d-a181-d31cd0a6ce74"
+      (reference "D17") (unit 1) (value "D_3.3V") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
     (path "/00000000-0000-0000-0000-00006371a3c4"
-      (reference "FB1") (unit 1) (value "Ferrite_Bead") (footprint "")
+      (reference "FB1") (unit 1) (value "1.5A 90m") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/52312712-94e9-4ebf-852a-d12eed32e67a"
       (reference "J1") (unit 1) (value "Conn_Rot") (footprint "")
@@ -4636,6 +5176,9 @@
     (path "/e21aa6cc-a597-408f-88dd-ba41e5756d37"
       (reference "J3") (unit 1) (value "Conn_LED") (footprint "")
     )
+    (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/a10c7624-74f2-4d74-b8c2-615a3c9319a6"
+      (reference "J4") (unit 1) (value "USB_B_Mini") (footprint "")
+    )
     (path "/e5be68d0-89c5-493b-949f-e77138cfc027"
       (reference "J5") (unit 1) (value "Conn_Usart") (footprint "")
     )
@@ -4672,233 +5215,290 @@
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/156be350-107a-47f8-be02-3421fecb5961"
       (reference "J16") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "")
     )
-    (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/a10c7624-74f2-4d74-b8c2-615a3c9319a6"
-      (reference "J?") (unit 1) (value "USB_B_Mini") (footprint "")
-    )
     (path "/00000000-0000-0000-0000-000063704da5"
-      (reference "JP1") (unit 1) (value "Jmp_Flash") (footprint "")
+      (reference "JP1") (unit 1) (value "Jmp_Flash") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/8de582c1-e1fd-48cf-b3e5-b5e7006ad8d3"
-      (reference "JP2") (unit 1) (value "JPShunt") (footprint "")
+      (reference "JP2") (unit 1) (value "JPShunt") (footprint "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/c777561f-ad51-4045-bcba-eac30c38eb2b"
-      (reference "JP3") (unit 1) (value "JPShunt") (footprint "")
+      (reference "JP3") (unit 1) (value "JPShunt") (footprint "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/aecc8acb-304f-4903-96d6-4b8584bca982"
-      (reference "JP4") (unit 1) (value "JPShunt") (footprint "")
+      (reference "JP4") (unit 1) (value "JPShunt") (footprint "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels")
     )
     (path "/cec8e67e-7fd3-401e-a417-3621aeb04922"
       (reference "LS1") (unit 1) (value "Speaker") (footprint "")
     )
     (path "/45a15488-24e9-4cab-b892-2575ecf9e908"
-      (reference "Q1") (unit 1) (value "Q_NPN_BCE") (footprint "")
+      (reference "Q1") (unit 1) (value "Q_NPN_BCE") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/67fcaece-80e9-4f1f-906d-1f4cc110f18b"
-      (reference "Q2") (unit 1) (value "Q_NPN_BCE") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/816c619b-5e67-4269-aac7-42488d5af89f"
+      (reference "Q2") (unit 1) (value "Q_NPN_BCE") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/4963f7f2-81c5-4bf1-a4d0-7bbedd69086e"
-      (reference "Q3") (unit 1) (value "Q_PMOS_DGS") (footprint "")
+      (reference "Q3") (unit 1) (value "Q_PMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/cac17ed7-f2ee-4369-9871-90c5115f1b3e"
-      (reference "Q4") (unit 1) (value "Q_NPN_BCE") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/47df29ed-226f-4269-9555-6d8a506a00c6"
+      (reference "Q4") (unit 1) (value "Q_NPN_BCE") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/9f759071-67ea-43aa-8748-dbab07b9cd02"
-      (reference "Q5") (unit 1) (value "Q_PMOS_DGS") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/3368d284-345a-47d0-8151-2435367c3e55"
+      (reference "Q5") (unit 1) (value "Q_PMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/4fd1bfb4-3b21-41ba-9acc-12c8b615da0c"
-      (reference "Q6") (unit 1) (value "Q_NPN_BCE") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/590c9cf9-1f36-4e8f-8d2d-f68ec921a062"
+      (reference "Q6") (unit 1) (value "Q_NPN_BCE") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/c25af5d5-4f2b-4d0f-ac67-9eb953275646"
-      (reference "Q7") (unit 1) (value "Q_PMOS_DGS") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/c14d41e5-e037-4449-9e9d-68def22bcfdd"
+      (reference "Q7") (unit 1) (value "Q_PMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
     (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/80ccbe92-8094-47d3-b408-c9f6b7f81d69"
-      (reference "Q8") (unit 1) (value "Q_NMOS_DGS") (footprint "")
+      (reference "Q8") (unit 1) (value "Q_NMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/c3536c43-613b-42e8-810d-2980e5599493"
-      (reference "Q9") (unit 1) (value "Q_NMOS_DGS") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/9f1254c7-673a-43f9-a86d-b5ad051b67e0"
+      (reference "Q9") (unit 1) (value "Q_NMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/be4f1d0b-48c1-4267-9745-49fb3c38df3d"
-      (reference "Q10") (unit 1) (value "Q_NMOS_DGS") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/5d9b171f-c945-4d92-8fc9-ff4addcb437a"
+      (reference "Q10") (unit 1) (value "Q_NMOS_DGS") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
     (path "/f303ef76-d27a-409e-8075-e8c01dcd1ea2"
-      (reference "R1") (unit 1) (value "R") (footprint "")
+      (reference "R1") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/5980fcdf-dedc-4b1d-b59c-ef12b1806c05"
-      (reference "R2") (unit 1) (value "R") (footprint "")
+    (path "/817e25a2-8673-40b2-be1c-18b259a1fe22"
+      (reference "R2") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/17c769b2-fbc4-492b-9289-6780fc4b3fee"
-      (reference "R3") (unit 1) (value "R") (footprint "")
+    (path "/a2d94e6d-c8db-4d4d-82c0-66eb9282228d"
+      (reference "R3") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/379f457f-d433-4a9f-9ddd-83719e2f0909"
-      (reference "R4") (unit 1) (value "10k") (footprint "")
+      (reference "R4") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/4bb60ce8-0a8b-4620-8fc9-8d5ff7370c3e"
-      (reference "R5") (unit 1) (value "10k") (footprint "")
+      (reference "R5") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/fc842231-725d-4498-bc7e-56f875188a79"
-      (reference "R6") (unit 1) (value "R") (footprint "")
+    (path "/da0e8533-f332-4691-b7dc-3ef13d4aa486"
+      (reference "R6") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/48c2626c-99bd-4c94-92f8-221166379f14"
-      (reference "R7") (unit 1) (value "R") (footprint "")
+    (path "/75a7de8e-60cc-416a-ba9e-f874351f540c"
+      (reference "R7") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/882dcdc2-0b9f-4811-8bef-6134d8680957"
-      (reference "R8") (unit 1) (value "R") (footprint "")
+    (path "/0daebaab-ebf9-4c26-9a90-afd951c097eb"
+      (reference "R8") (unit 1) (value "R") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/1352f09b-a902-46e1-9d87-17d89dff3309"
-      (reference "R9") (unit 1) (value "1k") (footprint "")
+      (reference "R9") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/8d662e08-e4d4-4aee-a530-f5dec4d438d1"
-      (reference "R10") (unit 1) (value "R") (footprint "")
+      (reference "R10") (unit 1) (value "nc") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00006370cc23"
-      (reference "R11") (unit 1) (value "10k") (footprint "")
+      (reference "R11") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-00006371aa80"
-      (reference "R12") (unit 1) (value "nc") (footprint "")
+      (reference "R12") (unit 1) (value "nc") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/fd8b021d-0ad2-45ef-b732-11349f404019"
-      (reference "R13") (unit 1) (value "5k") (footprint "")
+      (reference "R13") (unit 1) (value "5k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/eb402657-1599-4663-87ee-d5359227e6dd"
-      (reference "R14") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/a595e187-c458-40ca-83c7-ec8e11809a48"
+      (reference "R14") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/86eaeb12-5b4d-4abf-9f81-7242ef671eba"
-      (reference "R15") (unit 1) (value "R") (footprint "")
+      (reference "R15") (unit 1) (value "nc") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/81de166e-2b9b-455c-aff8-ed723a59e2f5"
-      (reference "R16") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/5e751380-65f8-4aa6-b20f-c0d975e0d835"
+      (reference "R16") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/09cd453e-37db-4260-929b-0fbf043a939f"
-      (reference "R17") (unit 1) (value "R") (footprint "")
+      (reference "R17") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/698462a2-e1e4-4ce3-86f6-33d7b0df33dd"
-      (reference "R18") (unit 1) (value "R") (footprint "")
+      (reference "R18") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/f757713b-b154-4699-92a8-8979299e6a47"
-      (reference "R19") (unit 1) (value "R") (footprint "")
+      (reference "R19") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/b4b12788-783e-4f20-8430-6ebbe7a38a64"
-      (reference "R20") (unit 1) (value "165") (footprint "")
+      (reference "R20") (unit 1) (value "165") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/25e99288-e5cb-4cf7-82ce-fcf8cb990124"
-      (reference "R21") (unit 1) (value "R") (footprint "")
+      (reference "R21") (unit 1) (value "nc") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/908ce167-3d05-49cd-8154-ff63081b0b88"
-      (reference "R22") (unit 1) (value "5k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/c0be57d3-0253-4b97-b875-081ea6a42ed0"
+      (reference "R22") (unit 1) (value "5k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/29dd3ea9-9692-4d3f-8aa4-5f5617ea9601"
-      (reference "R23") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/95f17206-bd5b-46e2-806f-72b8d3e69660"
+      (reference "R23") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/a2b67eac-1149-49df-91e2-f6341c4c4450"
-      (reference "R24") (unit 1) (value "R") (footprint "")
+      (reference "R24") (unit 1) (value "nc") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/96da55e6-c92f-4afa-8e20-0f557493f0a5"
-      (reference "R25") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/fe7dc4cf-059b-43d8-9aa4-dd252426165b"
+      (reference "R25") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/3646d81e-b992-44eb-b493-d11458366f66"
-      (reference "R26") (unit 1) (value "R") (footprint "")
+      (reference "R26") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/0a9f66d8-0159-4a33-a81d-1949b94129a1"
-      (reference "R27") (unit 1) (value "R") (footprint "")
+      (reference "R27") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/2c98be25-824a-48b4-959f-7f54b048fa42"
-      (reference "R28") (unit 1) (value "R") (footprint "")
+      (reference "R28") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/9784dedb-5ce2-4c76-b601-bbc68b9882cf"
-      (reference "R29") (unit 1) (value "165") (footprint "")
+      (reference "R29") (unit 1) (value "165") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/091ad072-0a63-465e-b649-81129d9d0e3c"
-      (reference "R30") (unit 1) (value "R") (footprint "")
+      (reference "R30") (unit 1) (value "nc") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/6e2fde92-ba6c-4bb2-b681-e3533596fc17"
-      (reference "R31") (unit 1) (value "5k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/5d04f5db-9f04-4d9f-8929-764887fdbd31"
+      (reference "R31") (unit 1) (value "5k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/b3362e2f-0473-4060-a579-068edbb6cbe1"
-      (reference "R32") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/9585ccc1-f8fc-4e33-9422-1d2238b71fc6"
+      (reference "R32") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/0e706056-bf0b-46c4-9a5d-ffdd70b4718d"
-      (reference "R33") (unit 1) (value "R") (footprint "")
+      (reference "R33") (unit 1) (value "nc") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-0000638247cb/a51be299-57ae-44a3-a788-1671ca07a9cf"
-      (reference "R34") (unit 1) (value "10k") (footprint "")
+    (path "/00000000-0000-0000-0000-0000638247cb/ecc13ab2-1692-49d9-b09f-276a8a7a64af"
+      (reference "R34") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/275dca18-2d92-454d-9b1f-3845521f9281"
-      (reference "R35") (unit 1) (value "R") (footprint "")
+      (reference "R35") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/3942470c-95d4-4ca2-a2be-77e1872eb413"
-      (reference "R36") (unit 1) (value "R") (footprint "")
+      (reference "R36") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/48aacb2f-dae8-46e1-b106-421fcb10106a"
-      (reference "R37") (unit 1) (value "R") (footprint "")
+      (reference "R37") (unit 1) (value "nc") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/a9fff867-4860-4e38-aa90-e67333b48a95"
-      (reference "R38") (unit 1) (value "165") (footprint "")
+      (reference "R38") (unit 1) (value "165") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal")
     )
     (path "/00000000-0000-0000-0000-0000638247cb/25ffa553-2a90-482e-92d5-71fb47446011"
-      (reference "R39") (unit 1) (value "R") (footprint "")
+      (reference "R39") (unit 1) (value "nc") (footprint "")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/075595fa-e1c7-4879-9416-4a2fb8916bc1"
-      (reference "R40") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/938d0f9e-4f4a-44d3-8851-441d60ef9864"
+      (reference "R40") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/d3cf5d7b-3d54-403b-a65d-348faf3cd92e"
-      (reference "R41") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/f415fcc5-b838-45dd-a2f0-dcbcd0f99d15"
+      (reference "R41") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/6d3d3847-e476-4c87-9ad6-88ca18d8272c"
-      (reference "R42") (unit 1) (value "10k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/ac25ff94-2aad-42fe-be65-13f2f4692194"
+      (reference "R42") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/e4c515ca-03d0-4892-9aa6-74262c35e750"
-      (reference "R43") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/6f9ca678-db16-4a38-bb5d-9a78a78c8efb"
+      (reference "R43") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/3b29c90f-2771-4827-b14d-ce95a51f60d5"
-      (reference "R44") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/22e05d06-cfb5-4d0d-a42e-ef4d90993a6b"
+      (reference "R44") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/c49287dc-2325-499e-8db1-b6780277c7e6"
-      (reference "R45") (unit 1) (value "10k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/b27330a2-6726-47c5-8c2c-5037384a5d88"
+      (reference "R45") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/7201553a-1338-4c18-ba81-d887a4b2fcdd"
-      (reference "R46") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/f52438d6-9c7e-4343-918b-d279ca2d4396"
+      (reference "R46") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/6cea7f3e-24f5-4a51-82f8-1c0b7dd66685"
-      (reference "R47") (unit 1) (value "1k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/4733dc44-c57e-42ed-8b1d-0c36d40cbb92"
+      (reference "R47") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/6919cc5d-8faf-4fe1-82f6-4039bfae5247"
-      (reference "R48") (unit 1) (value "10k") (footprint "")
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/cffba7df-18aa-4f42-bc57-59e9221fbf95"
+      (reference "R48") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/256f13c7-ec04-4759-8d13-037abd696296"
-      (reference "R49") (unit 1) (value "10k") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/60ccef23-3f0d-4690-b7a5-7b63d64ef8e2"
+      (reference "R49") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/730accdb-aaee-4169-8ec3-fb7bf2fabf4e"
-      (reference "R50") (unit 1) (value "10k") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/f6ce1f9c-7c08-4662-bf8a-ab784a1c175d"
+      (reference "R50") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/7f7f1ae6-5dbc-4de1-8a98-41bcf5d2c83b"
-      (reference "R51") (unit 1) (value "10k") (footprint "")
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/49621bd6-6719-4f7e-bc23-376c79491b99"
+      (reference "R51") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/a1d6275d-77ab-4d17-8a92-62188e251b81"
-      (reference "R52") (unit 1) (value "22") (footprint "")
+      (reference "R52") (unit 1) (value "22") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/a60d8ac2-5a22-4fee-baea-c9a4cac736ab"
-      (reference "R53") (unit 1) (value "22") (footprint "")
+    (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/cd49b1ec-7386-4769-849c-8305c27f7744"
+      (reference "R53") (unit 1) (value "22") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/38a945f1-6107-4d35-b3df-35a803e18da6"
-      (reference "R54") (unit 1) (value "33k") (footprint "")
+      (reference "R54") (unit 1) (value "33k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/23685d55-53d5-4e87-9e23-1d32545a56cd"
-      (reference "R55") (unit 1) (value "82k") (footprint "")
+      (reference "R55") (unit 1) (value "82k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/5284c6b6-6eee-468a-b427-ed9dd51f0735/2ab25ea2-e059-423e-a26c-71b4d4d71061"
-      (reference "R56") (unit 1) (value "5.1k") (footprint "")
+      (reference "R56") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/00000000-0000-0000-0000-0000637113ba"
-      (reference "SW1") (unit 1) (value "Btn_Reset") (footprint "")
+      (reference "SW1") (unit 1) (value "Btn_Reset") (footprint "Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5mm")
+    )
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/1069d6d6-c785-4085-8ce1-db9635c7ac31"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/1cdf60ae-3395-466a-9976-fe37458b71c6"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/3e5d86e2-adab-421f-bd51-f3d3873663e7"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/455c1377-71f5-445b-a375-aab2c1166db6"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/471150ca-5b09-4ad8-844b-bb7c699b5f29"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/508e44cc-35b0-44d1-99fe-5e9c7e210a72"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/54565c12-0de7-47fd-a9b6-d5af6358983d"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/587de3a7-f11d-4c26-9292-cc29d63dbc05"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/3101716b-13d5-4306-9f90-9c7d5abb9727/5efd494a-6297-4616-b517-9366ed4846cf"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/65580d2d-98cd-4177-9e74-9eef9156c010"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/71292fa8-7596-4655-9fd7-9007176e2b74"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/880bea86-f923-424f-9f45-bb1f889a74d6"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/91a2f4d4-05ca-4c1d-aca0-03abf45c23ed"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/91c2a95c-b74a-49c5-9e1e-554121cba191"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/6dcb714a-a131-4991-b11f-1be3e28a876a/953e0a09-97a9-46a0-84fa-1663ee10f9a3"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/a2f48f1d-5326-4de1-bfab-85e43ac66072"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/b055e194-0749-48b4-9b7f-f65fad0e2fde"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-0000638247cb/cd3f23e6-104f-4b44-b10f-7b1375df02ab"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/d010d1c6-7a54-4e13-9847-1ec25700d434"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
+    )
+    (path "/e7eee0ee-46c0-45f5-aaf3-8b3e6c2e1e3c"
+      (reference "TP?") (unit 1) (value "TestPoint_Alt") (footprint "")
     )
     (path "/00000000-0000-0000-0000-0000636c0193"
       (reference "U1") (unit 1) (value "STM32F411CEU6") (footprint "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm")
     )
     (path "/00000000-0000-0000-0000-0000636cbe2d"
-      (reference "Y1") (unit 1) (value "25MHz 9PF") (footprint "")
+      (reference "Y1") (unit 1) (value "25MHz 9PF") (footprint "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm")
     )
     (path "/00000000-0000-0000-0000-0000636dd6b1"
-      (reference "Y2") (unit 1) (value "32.768kHz 6pF") (footprint "")
+      (reference "Y2") (unit 1) (value "32.768kHz 6pF") (footprint "Crystal:Crystal_SMD_2012-2Pin_2.0x1.2mm")
     )
   )
 )
diff --git a/PCB/FloatPUMP/gpi_channels.kicad_sch b/PCB/FloatPUMP/gpi_channels.kicad_sch
index 3b4ace6..3352399 100644
--- a/PCB/FloatPUMP/gpi_channels.kicad_sch
+++ b/PCB/FloatPUMP/gpi_channels.kicad_sch
@@ -92,82 +92,59 @@
         )
       )
     )
-    (symbol "Device:D_Schottky" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 0 2.54 0)
+    (symbol "Connector:TestPoint_Alt" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "D_Schottky" (id 1) (at 0 -2.54 0)
+      (property "Value" "TestPoint_Alt" (id 1) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode Schottky" (id 4) (at 0 0 0)
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Schottky diode" (id 5) (at 0 0 0)
+      (property "ki_description" "test point (alternative shape)" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "D_Schottky_0_1"
+      (symbol "TestPoint_Alt_0_1"
         (polyline
           (pts
-            (xy 1.27 0)
-            (xy -1.27 0)
+            (xy 0 2.54)
+            (xy -0.762 3.302)
+            (xy 0 4.064)
+            (xy 0.762 3.302)
+            (xy 0 2.54)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 1.27 1.27)
-            (xy 1.27 -1.27)
-            (xy -1.27 0)
-            (xy 1.27 1.27)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.905 0.635)
-            (xy -1.905 1.27)
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
-            (xy -0.635 -1.27)
-            (xy -0.635 -0.635)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
       )
-      (symbol "D_Schottky_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
-          (name "K" (effects (font (size 1.27 1.27))))
+      (symbol "TestPoint_Alt_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
       )
     )
-    (symbol "Device:D_Zener" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "D_Zener_1" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D?" (id 0) (at 2.032 0.8347 90)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "D_Zener" (id 1) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "D_Zener_1" (id 1) (at 2.032 -1.7022 90)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809191825_LRC-LBZX84C3V3LT1G_C12745.pdf" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "ki_keywords" "diode" (id 4) (at 0 0 0)
@@ -179,7 +156,7 @@
       (property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "D_Zener_0_1"
+      (symbol "D_Zener_1_0_1"
         (polyline
           (pts
             (xy 1.27 0)
@@ -208,14 +185,14 @@
           (fill (type none))
         )
       )
-      (symbol "D_Zener_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
-          (name "K" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
+      (symbol "D_Zener_1_1_1"
         (pin passive line (at 3.81 0 180) (length 2.54)
           (name "A" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -3.81 0 0) (length 2.54)
+          (name "K" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
         )
       )
     )
@@ -258,6 +235,173 @@
         )
       )
     )
+    (symbol "Diode:BAT54S" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "D" (id 0) (at 0.635 -3.81 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "BAT54S" (id 1) (at -6.35 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 1.905 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds11005.pdf" (id 3) (at -3.048 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "schottky diode" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "schottky barrier diode" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "BAT54S_0_1"
+        (polyline
+          (pts
+            (xy -3.81 0)
+            (xy -1.27 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -3.175 -1.27)
+            (xy -3.175 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 -1.27)
+            (xy -3.175 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 -1.27)
+            (xy -2.54 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 1.27)
+            (xy -1.905 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.905 0)
+            (xy 1.905 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -1.905 1.27)
+            (xy -1.905 1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.27 0)
+            (xy 3.81 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.175 -1.27)
+            (xy 3.175 -1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 -1.27)
+            (xy 3.175 -1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 -1.27)
+            (xy 3.81 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 1.27)
+            (xy 4.445 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 4.445 1.27)
+            (xy 4.445 1.016)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -4.445 1.27)
+            (xy -4.445 -1.27)
+            (xy -2.54 0)
+            (xy -4.445 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 1.905 1.27)
+            (xy 1.905 -1.27)
+            (xy 3.81 0)
+            (xy 1.905 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 0 0) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+      )
+      (symbol "BAT54S_1_1"
+        (pin passive line (at -7.62 0 0) (length 3.81)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 7.62 0 180) (length 3.81)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -5.08 90) (length 5.08)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "power:+24V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -404,677 +548,686 @@
     )
   )
 
-  (junction (at 66.04 109.22) (diameter 0) (color 0 0 0 0)
-    (uuid 1b33452c-3d8d-4080-b876-7f6ad1aa47ce)
+  (junction (at 203.2 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid 0e03c370-3c8a-4329-aee3-ae23772be4e8)
   )
-  (junction (at 36.83 96.52) (diameter 0) (color 0 0 0 0)
+  (junction (at 66.04 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid 1fb16dce-635e-4bb6-a6d6-d88a6f958c0d)
+  )
+  (junction (at 73.025 124.46) (diameter 0) (color 0 0 0 0)
     (uuid 2aa7e3ef-e40b-4b5d-8ec2-143e2eec0d9c)
   )
-  (junction (at 74.295 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid 3abb81c2-fc52-4dc4-bf68-0b9b040f29ec)
-  )
-  (junction (at 92.71 109.22) (diameter 0) (color 0 0 0 0)
-    (uuid 5e1c618a-609c-429f-8d82-b0dff9d3eac7)
-  )
-  (junction (at 45.085 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid 618441c8-3a2b-43aa-b712-0fb9457f8028)
-  )
-  (junction (at 82.55 22.86) (diameter 0) (color 0 0 0 0)
+  (junction (at 129.54 38.1) (diameter 0) (color 0 0 0 0)
     (uuid 92238b67-d507-4e9c-b79d-84c7a3f928a0)
   )
-  (junction (at 82.55 33.02) (diameter 0) (color 0 0 0 0)
+  (junction (at 129.54 48.26) (diameter 0) (color 0 0 0 0)
     (uuid a5c097bc-8d76-46c7-9cce-7913aa72464d)
   )
-  (junction (at 92.71 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid ae69e5ed-2b27-401e-a9a7-578f7c378d07)
+  (junction (at 132.08 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid b806fd27-a0e5-4cd3-9b0d-30db91dd5387)
   )
-  (junction (at 66.04 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid c83a7cc0-2ea1-4c02-b3f4-f12dfec12d4b)
+  (junction (at 210.82 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid b8ecefca-22fb-4d9f-9b48-6fe91112cb7d)
   )
-  (junction (at 36.83 109.22) (diameter 0) (color 0 0 0 0)
-    (uuid f0415e2d-1370-4210-86ff-3656a5aaf76b)
-  )
-  (junction (at 100.965 96.52) (diameter 0) (color 0 0 0 0)
-    (uuid fdd1980b-926b-49dc-a5f3-af6a59118e4f)
+  (junction (at 140.335 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid f4b3b70c-cc41-468d-a873-2bb971faa8a4)
   )
 
-  (wire (pts (xy 100.965 93.98) (xy 100.965 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 06e24847-7e22-4eeb-bb57-52479349d2bf)
-  )
-  (wire (pts (xy 93.98 43.18) (xy 82.55 43.18))
+  (wire (pts (xy 140.97 58.42) (xy 129.54 58.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0898fffa-8df4-4c35-8940-c2a276d98fa4)
   )
-  (wire (pts (xy 92.71 109.22) (xy 92.71 110.49))
+  (wire (pts (xy 140.335 134.62) (xy 140.335 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 10308a36-0d45-4b15-b92b-823ae29baaf5)
+    (uuid 0dee02f8-4b8e-42b1-b042-971f9fd6876e)
   )
-  (wire (pts (xy 74.295 83.82) (xy 74.295 86.36))
+  (wire (pts (xy 210.82 114.3) (xy 210.82 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 172c08ea-47d7-4754-8a89-55e592caf05f)
+    (uuid 16a402d5-4021-4df9-96cb-81815982a2b2)
   )
-  (wire (pts (xy 30.48 99.06) (xy 30.48 96.52))
+  (wire (pts (xy 66.04 124.46) (xy 73.025 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1b14bb86-80ce-4d19-a868-e9080f035fb5)
+    (uuid 24bf1cb3-844e-4a16-855c-298d92a21246)
   )
-  (wire (pts (xy 30.48 109.22) (xy 30.48 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1dc431b7-9d77-4d90-a815-126724399a54)
-  )
-  (wire (pts (xy 30.48 96.52) (xy 36.83 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1edef415-ac0f-464c-bcf5-d2fc0595789c)
-  )
-  (wire (pts (xy 82.55 22.86) (xy 82.55 33.02))
+  (wire (pts (xy 129.54 38.1) (xy 129.54 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 281629fa-9d7d-4f24-9788-ccc8bb1a6451)
   )
-  (wire (pts (xy 85.09 45.72) (xy 93.98 45.72))
+  (wire (pts (xy 198.12 124.46) (xy 203.2 124.46))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2ce9a0be-472a-4ce1-90fd-f92632b6de54)
+  )
+  (wire (pts (xy 132.08 60.96) (xy 140.97 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2fa6558b-f789-4307-a3d3-dbca2c6718e5)
   )
-  (wire (pts (xy 36.83 93.98) (xy 36.83 96.52))
+  (wire (pts (xy 73.025 121.92) (xy 73.025 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3241c0d1-7f27-4109-bbbd-49566979652b)
   )
-  (wire (pts (xy 92.71 93.98) (xy 92.71 96.52))
+  (wire (pts (xy 140.335 121.92) (xy 140.335 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 324bd901-c083-466c-a4c2-2cb74643914c)
+    (uuid 38b3fbfb-bd81-4a11-b1c5-4ab66055a056)
   )
-  (wire (pts (xy 66.04 109.22) (xy 59.69 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 38507c47-0c19-4c6a-994b-fb0927c1adfc)
-  )
-  (wire (pts (xy 36.83 96.52) (xy 36.83 99.06))
+  (wire (pts (xy 73.025 124.46) (xy 73.025 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a0c9a53-671e-46a8-b38b-fa3c1dea67ea)
   )
-  (wire (pts (xy 82.55 43.18) (xy 82.55 33.02))
+  (wire (pts (xy 122.555 114.3) (xy 122.555 116.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3a5c50fb-0345-4d85-a577-014d86b02d65)
+  )
+  (wire (pts (xy 129.54 58.42) (xy 129.54 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3b33cba0-d51e-4568-ae99-5639de9ed4ad)
   )
-  (wire (pts (xy 36.83 96.52) (xy 45.085 96.52))
+  (wire (pts (xy 73.025 124.46) (xy 83.185 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3b56333a-70ba-4c47-8fdf-8089ce3e1c07)
   )
-  (wire (pts (xy 36.83 86.36) (xy 36.83 69.85))
+  (wire (pts (xy 73.025 114.3) (xy 73.025 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 43a4305c-036f-4bac-81b3-5bd700f201ac)
   )
-  (wire (pts (xy 59.69 109.22) (xy 59.69 106.68))
+  (wire (pts (xy 210.82 124.46) (xy 210.82 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 471312fd-080e-40f7-9ce2-80c9e30d953c)
+    (uuid 45fdd810-d4f4-4f66-8ea6-15e91d178605)
   )
-  (wire (pts (xy 59.69 99.06) (xy 59.69 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5307aad5-6fc6-4657-aef6-015cd25a8256)
-  )
-  (wire (pts (xy 82.55 33.02) (xy 93.98 33.02))
+  (wire (pts (xy 129.54 48.26) (xy 140.97 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 55e7159a-af46-4d5e-8aae-3d5c725e1693)
   )
-  (wire (pts (xy 59.69 96.52) (xy 66.04 96.52))
+  (wire (pts (xy 210.82 124.46) (xy 223.52 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5a85ac38-10b5-445e-a218-ebcfe1e7816d)
+    (uuid 6776cb5e-6d6a-4344-bd88-0a3a0a6ee884)
   )
-  (wire (pts (xy 45.085 93.98) (xy 45.085 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5e8e83f6-2c71-4608-8445-2a514f9988ac)
-  )
-  (wire (pts (xy 85.09 25.4) (xy 93.98 25.4))
+  (wire (pts (xy 132.08 40.64) (xy 140.97 40.64))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68877fa6-fd3f-459e-871c-8f7b3e929f96)
   )
-  (wire (pts (xy 92.71 109.22) (xy 87.63 109.22))
+  (wire (pts (xy 55.245 114.3) (xy 55.245 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6e6602e7-9089-4255-a871-1fac192b48b6)
+    (uuid 6de9f3ff-2440-46b0-b7b1-78cac804dbdf)
   )
-  (wire (pts (xy 66.04 106.68) (xy 66.04 109.22))
+  (wire (pts (xy 55.245 132.08) (xy 55.245 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 71cc9a22-e6d8-40d1-86eb-c042702ada7e)
+    (uuid 6ff00009-14d7-4825-bc69-cdc252f75b63)
   )
-  (wire (pts (xy 66.04 86.36) (xy 66.04 69.85))
+  (wire (pts (xy 210.82 121.92) (xy 210.82 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7901b46c-1dc8-4163-a7f3-cc94afc862b6)
+    (uuid 78da0707-f0bb-4796-9374-1d0b490886c3)
   )
-  (wire (pts (xy 66.04 96.52) (xy 66.04 99.06))
+  (wire (pts (xy 127.635 124.46) (xy 132.08 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7dcfbf57-96f1-4483-898c-e2ef82d23680)
+    (uuid 7b0fadfa-2dbe-41d9-b749-35632752df15)
   )
-  (wire (pts (xy 93.98 22.86) (xy 82.55 22.86))
+  (wire (pts (xy 140.97 38.1) (xy 129.54 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7fbb1f5c-e0d2-4ef5-9aac-61d12e559205)
   )
-  (wire (pts (xy 36.83 109.22) (xy 36.83 110.49))
+  (wire (pts (xy 73.025 134.62) (xy 73.025 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 85f006e7-f9bf-42ef-87b6-8413e4e35ac2)
   )
-  (wire (pts (xy 100.965 83.82) (xy 100.965 86.36))
+  (wire (pts (xy 60.325 124.46) (xy 66.04 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 87351eba-ce9c-4231-ac32-d8b1847689c2)
+    (uuid 885661e5-ccd0-47bb-a5d2-370303ee9bfb)
   )
-  (wire (pts (xy 100.965 96.52) (xy 102.87 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8fc2a326-0888-42c0-9f04-24355c35bb88)
-  )
-  (wire (pts (xy 36.83 69.85) (xy 46.99 69.85))
+  (wire (pts (xy 73.025 97.79) (xy 83.185 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90a1e176-955b-4bd7-81e5-ef484d08a6d7)
   )
-  (wire (pts (xy 36.83 106.68) (xy 36.83 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 925be063-f759-4e6b-8823-7c50c477650e)
-  )
-  (wire (pts (xy 87.63 109.22) (xy 87.63 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9337470d-d252-4506-b507-77f4ddd970df)
-  )
-  (wire (pts (xy 92.71 69.85) (xy 102.87 69.85))
+  (wire (pts (xy 210.82 97.79) (xy 223.52 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 988bcc10-a69c-40c3-ad4a-d4024b572f2c)
   )
-  (wire (pts (xy 66.04 109.22) (xy 66.04 110.49))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 99b20fd9-a0eb-434c-9d36-7698aac704cf)
-  )
-  (wire (pts (xy 92.71 96.52) (xy 92.71 99.06))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9a4a49bc-a486-4124-b37a-19e0261e2b50)
-  )
-  (wire (pts (xy 87.63 96.52) (xy 92.71 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9b787b3b-1cc5-429d-ae01-1dff96d9bd2f)
-  )
-  (wire (pts (xy 66.04 69.85) (xy 76.2 69.85))
+  (wire (pts (xy 140.335 97.79) (xy 150.495 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a7e5cf50-d3ec-49df-98f0-aa8ef0cec0ab)
   )
-  (wire (pts (xy 82.55 19.05) (xy 82.55 22.86))
+  (wire (pts (xy 129.54 34.29) (xy 129.54 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa76493f-ee06-4970-ad88-95fcff784634)
   )
-  (wire (pts (xy 85.09 35.56) (xy 93.98 35.56))
+  (wire (pts (xy 193.04 114.3) (xy 193.04 116.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid af206e89-b12e-4563-bec4-5c00c8d85342)
+  )
+  (wire (pts (xy 203.2 124.46) (xy 210.82 124.46))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid afe52a86-2aba-431e-bb6c-025675878de4)
+  )
+  (wire (pts (xy 140.335 97.79) (xy 140.335 114.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b213d94f-0f79-49af-a9af-7b114dcb7cd9)
+  )
+  (wire (pts (xy 132.08 50.8) (xy 140.97 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bfc7e5bb-1ce7-4a25-b6c6-996ba2bb029c)
   )
-  (wire (pts (xy 36.83 109.22) (xy 30.48 109.22))
+  (wire (pts (xy 122.555 132.08) (xy 122.555 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c09b445c-7c2b-40cb-8b31-2b21d33066d1)
+    (uuid c9a592c8-84fa-43ed-be6c-c5863d47cd14)
   )
-  (wire (pts (xy 74.295 93.98) (xy 74.295 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c17ca05c-d6b5-4433-a64a-385219daf10a)
-  )
-  (wire (pts (xy 45.085 96.52) (xy 46.99 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c553aa25-0326-4c50-a5b6-f5b57aec99b0)
-  )
-  (wire (pts (xy 92.71 86.36) (xy 92.71 69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c8a490dd-4882-4f6f-89e6-2d69452d1b7d)
-  )
-  (wire (pts (xy 74.295 96.52) (xy 76.2 96.52))
+  (wire (pts (xy 140.335 124.46) (xy 152.4 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc82249b-411e-458e-9614-c199b389b67b)
   )
-  (wire (pts (xy 92.71 96.52) (xy 100.965 96.52))
+  (wire (pts (xy 140.335 124.46) (xy 140.335 127))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cce6585e-41ef-4848-9892-274dd2b819f7)
+    (uuid cda956d5-2c0f-4df5-8b2c-b548555fbccb)
   )
-  (wire (pts (xy 92.71 106.68) (xy 92.71 109.22))
+  (wire (pts (xy 132.08 124.46) (xy 140.335 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cdbed077-ae3e-4ad3-a630-f57fc5c66016)
+    (uuid d8372c2c-e57f-44d7-a2a7-14486ddbb70f)
   )
-  (wire (pts (xy 66.04 93.98) (xy 66.04 96.52))
+  (wire (pts (xy 193.04 132.08) (xy 193.04 135.255))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d5472b59-7814-425a-a718-83dd4583070e)
+    (uuid ddb79a2c-b3ea-49f8-8265-31f0a330e48d)
   )
-  (wire (pts (xy 66.04 96.52) (xy 74.295 96.52))
+  (wire (pts (xy 210.82 134.62) (xy 210.82 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dc8a4efa-ee02-4204-a362-176d5944fce0)
-  )
-  (wire (pts (xy 87.63 99.06) (xy 87.63 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e59c5176-34b0-4657-9c95-8954671ad325)
-  )
-  (wire (pts (xy 45.085 83.82) (xy 45.085 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ff5976ca-f277-42ae-9a89-f52b66edb554)
+    (uuid e2829fff-70da-4ab0-b13c-74451ab32c50)
   )
 
-  (label "GPIT1" (at 76.2 69.85 180)
+  (label "GPIT1" (at 150.495 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 2dcd38d1-170c-4a46-a190-039a547d9f03)
   )
-  (label "GPIT1" (at 85.09 35.56 0)
+  (label "GPIT1" (at 132.08 50.8 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3cd8d06b-0220-493a-9fb9-be3d4763c8d1)
   )
-  (label "GPIT0" (at 46.99 69.85 180)
+  (label "GPIT0" (at 83.185 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3f2aa6f2-dc29-4a0a-9b9e-6ef8847c0626)
   )
-  (label "GPIT0" (at 85.09 25.4 0)
+  (label "GPIT0" (at 132.08 40.64 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7b765b47-4502-4833-8bcf-e115b1eb2409)
   )
-  (label "GPIT2" (at 85.09 45.72 0)
+  (label "GPIT2" (at 132.08 60.96 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 91329638-f41a-4cfa-b223-740738d57de0)
   )
-  (label "GPIT2" (at 102.87 69.85 180)
+  (label "GPIT2" (at 223.52 97.79 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid eb3cd018-bbad-49f5-b185-b6712aecb234)
   )
 
-  (hierarchical_label "GPI_IN0" (shape input) (at 46.99 96.52 0)
+  (hierarchical_label "GPI_IN0" (shape input) (at 83.185 124.46 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 162c6d60-05ef-4a3b-a7c7-cc1a45f55b47)
   )
-  (hierarchical_label "GPI_IN2" (shape input) (at 102.87 96.52 0)
+  (hierarchical_label "GPI_IN2" (shape input) (at 223.52 124.46 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4a6826c9-02a8-4564-ade5-5eb9e8ec304c)
   )
-  (hierarchical_label "GPI_IN1" (shape input) (at 76.2 96.52 0)
+  (hierarchical_label "GPI_IN1" (shape input) (at 152.4 124.46 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 5b493659-5bb8-400a-8707-de7d1f4215bd)
   )
 
-  (symbol (lib_id "power:+24V") (at 82.55 19.05 0) (unit 1)
+  (symbol (lib_id "power:+24V") (at 129.54 34.29 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0545d7ec-9cad-4552-afb9-35b04ed431b9)
-    (property "Reference" "#PWR065" (id 0) (at 82.55 22.86 0)
+    (property "Reference" "#PWR065" (id 0) (at 129.54 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+24V" (id 1) (at 82.55 15.4742 0))
-    (property "Footprint" "" (id 2) (at 82.55 19.05 0)
+    (property "Value" "+24V" (id 1) (at 129.54 30.7142 0))
+    (property "Footprint" "" (id 2) (at 129.54 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 82.55 19.05 0)
+    (property "Datasheet" "" (id 3) (at 129.54 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 843f7195-f5ab-4363-ad9d-35b37d444923))
   )
 
-  (symbol (lib_id "power:GND") (at 36.83 110.49 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 73.025 138.43 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0b332ae8-8af3-43a3-95a2-d7f2823277e2)
-    (property "Reference" "#PWR063" (id 0) (at 36.83 116.84 0)
+    (property "Reference" "#PWR063" (id 0) (at 73.025 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 36.83 114.9334 0))
-    (property "Footprint" "" (id 2) (at 36.83 110.49 0)
+    (property "Value" "GND" (id 1) (at 73.025 142.8734 0))
+    (property "Footprint" "" (id 2) (at 73.025 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.83 110.49 0)
+    (property "Datasheet" "" (id 3) (at 73.025 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c1dfdedc-e3f5-4f14-91e5-829f7b44cfa4))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 87.63 102.87 270) (unit 1)
+  (symbol (lib_name "D_Zener_1") (lib_id "Device:D_Zener") (at 210.82 130.81 270) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 0b6e6641-1a47-44b3-88e7-30c3217925c1)
-    (property "Reference" "D16" (id 0) (at 90.17 100.965 0)
+    (uuid 1b7ebed8-1682-4f6d-a181-d31cd0a6ce74)
+    (property "Reference" "D17" (id 0) (at 212.725 130.81 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "D_Schottky" (id 1) (at 83.185 97.79 0)
+    (property "Value" "D_3.3V" (id 1) (at 212.725 132.715 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 87.63 102.87 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 210.82 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 87.63 102.87 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809191825_LRC-LBZX84C3V3LT1G_C12745.pdf" (id 3) (at 210.82 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5f208f4b-00c4-4cb9-a395-2f90ffaf4753))
-    (pin "2" (uuid b3448023-5184-435b-a6b8-9b6a151a7e84))
+    (pin "1" (uuid 5a607fce-b807-47b1-8150-254bd59f3373))
+    (pin "3" (uuid 135d113e-38b0-4a93-a60c-80d5d8dabff2))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 45.085 90.17 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 1b7ac5b8-bd9e-4cd6-901f-1d049ab25dff)
-    (property "Reference" "D?" (id 0) (at 47.117 89.0178 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "D_Schottky" (id 1) (at 47.117 91.5547 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 45.085 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 45.085 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b7ccb9de-41cf-4393-abb8-df072a58f513))
-    (pin "2" (uuid 023c30c3-8195-44d6-9697-3706d49897f2))
-  )
-
-  (symbol (lib_id "Device:D_Schottky") (at 74.295 90.17 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 1ea2f135-9ec2-4f4d-a0fb-63badacb693d)
-    (property "Reference" "D?" (id 0) (at 76.327 89.0178 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "D_Schottky" (id 1) (at 76.327 91.5547 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 74.295 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 74.295 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 4f1b4071-47b1-4c5c-a64c-8dda0c4003ab))
-    (pin "2" (uuid c9db11f7-9429-45bd-b1e0-2043d11f14f0))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 100.965 83.82 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 23c61aba-ac88-4ecf-a45d-ff481a634acb)
-    (property "Reference" "#PWR?" (id 0) (at 100.965 87.63 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 100.965 80.2442 0))
-    (property "Footprint" "" (id 2) (at 100.965 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 100.965 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6c25799c-e85b-48f4-a00a-752665a32231))
-  )
-
-  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 99.06 22.86 0) (unit 1)
+  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 146.05 38.1 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2538d852-d332-4187-8f68-84b60b3cabe3)
-    (property "Reference" "J13" (id 0) (at 101.092 23.2953 0)
+    (property "Reference" "J13" (id 0) (at 148.082 38.5353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Screw_Terminal_01x02" (id 1) (at 101.092 25.8322 0)
+    (property "Value" "Screw_Terminal_01x02" (id 1) (at 148.082 41.0722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 99.06 22.86 0)
+    (property "Footprint" "" (id 2) (at 146.05 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 99.06 22.86 0)
+    (property "Datasheet" "~" (id 3) (at 146.05 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fb936880-eea5-4944-ae4c-b6da53eee884))
     (pin "2" (uuid f17dc3ed-1707-486d-a469-f9b806229eb3))
   )
 
-  (symbol (lib_id "Device:R") (at 36.83 90.17 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 256f13c7-ec04-4759-8d13-037abd696296)
-    (property "Reference" "R49" (id 0) (at 38.608 89.3353 0)
+  (symbol (lib_name "D_Zener_1") (lib_id "Device:D_Zener") (at 73.025 130.81 270) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 40b28f98-2128-4d2f-9da4-6c39e881cbdf)
+    (property "Reference" "D13" (id 0) (at 74.93 130.81 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 38.608 91.8722 0)
+    (property "Value" "D_3.3V" (id 1) (at 74.93 132.715 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 35.052 90.17 90)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 73.025 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 36.83 90.17 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809191825_LRC-LBZX84C3V3LT1G_C12745.pdf" (id 3) (at 73.025 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3b5bbbe4-0676-4316-a6f7-05b13cea7a50))
-    (pin "2" (uuid 1a62afa5-7e64-4f41-a4f1-6f34edc2ecd7))
+    (pin "1" (uuid d1fdbd1c-db2e-4264-9368-daac47765dea))
+    (pin "3" (uuid 59823b54-133b-4aea-bcd9-8a0fd37174f1))
   )
 
-  (symbol (lib_id "power:GND") (at 66.04 110.49 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 203.2 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 2c661355-004a-4aad-bcd6-6fbfb96749d2)
-    (property "Reference" "#PWR064" (id 0) (at 66.04 116.84 0)
+    (uuid 471150ca-5b09-4ad8-844b-bb7c699b5f29)
+    (property "Reference" "TP?" (id 0) (at 204.597 120.3233 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 204.597 122.8602 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 208.28 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 66.04 114.9334 0))
-    (property "Footprint" "" (id 2) (at 66.04 110.49 0)
+    (property "Datasheet" "~" (id 3) (at 208.28 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 66.04 110.49 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e0485277-6615-4e87-a411-d76d815348a7))
+    (pin "1" (uuid 5db7daf1-8db9-4d41-a63e-66b5af4ff64b))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 74.295 83.82 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 210.82 118.11 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3daba886-f922-4d7a-b618-d4db473bb2d4)
-    (property "Reference" "#PWR?" (id 0) (at 74.295 87.63 0)
+    (uuid 49621bd6-6719-4f7e-bc23-376c79491b99)
+    (property "Reference" "R51" (id 0) (at 212.598 117.2753 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 212.598 119.8122 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 209.042 118.11 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 74.295 80.2442 0))
-    (property "Footprint" "" (id 2) (at 74.295 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 210.82 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 74.295 83.82 0)
+    (property "JLCPCB" "C238881" (id 4) (at 210.82 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 13ae832a-8fbf-4bbd-9cb4-56f59b1825a9))
+    (pin "1" (uuid 7a07ee45-7cc4-4bad-99f0-4002a8a47d0d))
+    (pin "2" (uuid e1093a6b-f9da-417b-90cf-03c4a4c36771))
   )
 
-  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 99.06 43.18 0) (unit 1)
+  (symbol (lib_id "Diode:BAT54S") (at 193.04 124.46 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 4ab00a4c-694d-46d3-b3d0-bb46287df2d1)
+    (property "Reference" "D16" (id 0) (at 191.135 123.6253 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "BAT54S" (id 1) (at 191.135 126.1622 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 189.865 122.555 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds11005.pdf" (id 3) (at 193.04 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C2762214" (id 4) (at 193.04 124.46 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a85e97d1-dbc4-4b6c-bfd9-f93f9c867612))
+    (pin "2" (uuid da2dc289-1c55-4ec5-9096-fd702170c5a2))
+    (pin "3" (uuid 632ffd27-be64-4d73-a640-254a87addce8))
+  )
+
+  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 146.05 58.42 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f5d46ee-74c3-405b-8e42-beadb0d89d9b)
-    (property "Reference" "J15" (id 0) (at 101.092 43.6153 0)
+    (property "Reference" "J15" (id 0) (at 148.082 58.8553 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Screw_Terminal_01x02" (id 1) (at 101.092 46.1522 0)
+    (property "Value" "Screw_Terminal_01x02" (id 1) (at 148.082 61.3922 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 99.06 43.18 0)
+    (property "Footprint" "" (id 2) (at 146.05 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 99.06 43.18 0)
+    (property "Datasheet" "~" (id 3) (at 146.05 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8f4bdcaa-b6cc-4b6a-802c-187a50ddcbe9))
     (pin "2" (uuid cabc85e2-d023-4eaf-85d4-315e1a8d37b1))
   )
 
-  (symbol (lib_id "Device:D_Zener") (at 92.71 102.87 270) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 132.08 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5d282cb1-4b66-47fa-8cbd-cd6204e38a41)
-    (property "Reference" "D17" (id 0) (at 94.742 102.0353 90)
+    (uuid 54565c12-0de7-47fd-a9b6-d5af6358983d)
+    (property "Reference" "TP?" (id 0) (at 133.477 120.3233 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "3.3V" (id 1) (at 94.742 104.5722 90)
+    (property "Value" "TestPoint_Alt" (id 1) (at 133.477 122.8602 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 92.71 102.87 0)
+    (property "Footprint" "" (id 2) (at 137.16 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 92.71 102.87 0)
+    (property "Datasheet" "~" (id 3) (at 137.16 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 75cea8b3-91d0-42c0-ad11-86c3ff9b9c7a))
-    (pin "2" (uuid 8ad62adb-49e2-4a89-91d6-c83767709b5e))
+    (pin "1" (uuid 366c181c-464d-407f-a319-4ead33f9bc7c))
   )
 
-  (symbol (lib_id "Device:D_Zener") (at 66.04 102.87 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 73.025 118.11 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 67628182-0947-4e48-a0b8-814d153031bf)
-    (property "Reference" "D15" (id 0) (at 68.072 102.0353 90)
+    (uuid 60ccef23-3f0d-4690-b7a5-7b63d64ef8e2)
+    (property "Reference" "R49" (id 0) (at 74.803 117.2753 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "3.3V" (id 1) (at 68.072 104.5722 90)
+    (property "Value" "10k" (id 1) (at 74.803 119.8122 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 66.04 102.87 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 71.247 118.11 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 66.04 102.87 0)
+    (property "Datasheet" "~" (id 3) (at 73.025 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3165a9f1-b387-4a36-b94e-b8f4f6caa2df))
-    (pin "2" (uuid ceda3404-e6ce-4d6c-b65d-0fa5aa62740b))
+    (property "JLCPCB" "C238881" (id 4) (at 73.025 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3b5ceacb-3768-4fea-9443-911ab5e0cbf4))
+    (pin "2" (uuid 0de22b4f-d8ec-4987-857e-c1d88be1ac9f))
   )
 
-  (symbol (lib_id "power:GND") (at 92.71 110.49 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 55.245 135.255 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6d40a308-0373-4a4e-a518-5cfa4a688487)
-    (property "Reference" "#PWR066" (id 0) (at 92.71 116.84 0)
+    (uuid 62d108a1-1468-4dfb-906f-f388e3162ca5)
+    (property "Reference" "#PWR0106" (id 0) (at 55.245 141.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 92.71 114.9334 0))
-    (property "Footprint" "" (id 2) (at 92.71 110.49 0)
+    (property "Value" "GND" (id 1) (at 55.245 139.6984 0))
+    (property "Footprint" "" (id 2) (at 55.245 135.255 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 92.71 110.49 0)
+    (property "Datasheet" "" (id 3) (at 55.245 135.255 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8502e36b-f24d-433b-b331-33194c5d4f7e))
+    (pin "1" (uuid 640df6d5-1737-4d33-9b17-e16a3031105f))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 100.965 90.17 270) (unit 1)
+  (symbol (lib_id "power:GND") (at 122.555 135.255 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 71f15a40-0fa6-4e12-9551-dd6d01863870)
-    (property "Reference" "D?" (id 0) (at 102.997 89.0178 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "D_Schottky" (id 1) (at 102.997 91.5547 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 100.965 90.17 0)
+    (uuid 6634c0d6-74ea-4897-bb5d-27da957caba1)
+    (property "Reference" "#PWR0104" (id 0) (at 122.555 141.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 100.965 90.17 0)
+    (property "Value" "GND" (id 1) (at 122.555 139.6984 0))
+    (property "Footprint" "" (id 2) (at 122.555 135.255 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 471aac73-ff68-44a1-a01b-09ca9fa0a180))
-    (pin "2" (uuid 5a368cac-1c5d-4a47-b7c3-2a5be048c8f0))
+    (property "Datasheet" "" (id 3) (at 122.555 135.255 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 33125bce-2357-4732-a475-1209c3bbe2d8))
   )
 
-  (symbol (lib_id "Device:R") (at 66.04 90.17 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 193.04 135.255 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 730accdb-aaee-4169-8ec3-fb7bf2fabf4e)
-    (property "Reference" "R50" (id 0) (at 67.818 89.3353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 67.818 91.8722 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 64.262 90.17 90)
+    (uuid 678ac74d-3939-4210-af63-200a75e4bd3c)
+    (property "Reference" "#PWR0109" (id 0) (at 193.04 141.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 66.04 90.17 0)
+    (property "Value" "GND" (id 1) (at 193.04 139.6984 0))
+    (property "Footprint" "" (id 2) (at 193.04 135.255 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1eb5d343-fcc4-4de8-a877-f4248b4015cd))
-    (pin "2" (uuid e76fa080-dcd1-40f8-ad75-eede3534e8c6))
+    (property "Datasheet" "" (id 3) (at 193.04 135.255 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7f015532-808f-49f0-b833-f2fef254d051))
   )
 
-  (symbol (lib_id "Device:D_Zener") (at 36.83 102.87 270) (unit 1)
+  (symbol (lib_id "power:GND") (at 210.82 138.43 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 7dd6e74d-fda7-42d8-ba93-5bfb39ee8417)
-    (property "Reference" "D13" (id 0) (at 38.862 102.0353 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "3.3V" (id 1) (at 38.862 104.5722 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 36.83 102.87 0)
+    (uuid 69a8a82f-daa7-4ac0-ab39-aa3a6c7ed206)
+    (property "Reference" "#PWR0108" (id 0) (at 210.82 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 36.83 102.87 0)
+    (property "Value" "GND" (id 1) (at 210.82 142.8734 0))
+    (property "Footprint" "" (id 2) (at 210.82 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid d28dd5e5-c70b-4ef7-86fc-c3900cf46d33))
-    (pin "2" (uuid f8650df4-4c3e-4717-989f-a0b2805e2be0))
+    (property "Datasheet" "" (id 3) (at 210.82 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid abe8d48b-0b0b-4f78-bfa5-926a4dd99f7a))
   )
 
-  (symbol (lib_id "Device:R") (at 92.71 90.17 0) (unit 1)
+  (symbol (lib_id "Diode:BAT54S") (at 122.555 124.46 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 7f7f1ae6-5dbc-4de1-8a98-41bcf5d2c83b)
-    (property "Reference" "R51" (id 0) (at 94.488 89.3353 0)
+    (uuid 6cb5d89c-6d57-45c5-84a2-acae7e66daf5)
+    (property "Reference" "D14" (id 0) (at 120.65 123.6253 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 94.488 91.8722 0)
+    (property "Value" "BAT54S" (id 1) (at 120.65 126.1622 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 90.932 90.17 90)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 119.38 122.555 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds11005.pdf" (id 3) (at 122.555 127.508 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 92.71 90.17 0)
+    (property "JLCPCB" "C2762214" (id 4) (at 122.555 124.46 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e8269ab6-b546-467c-8fcc-21bb42d28f6a))
-    (pin "2" (uuid 8a0e3df3-1037-4f5b-a41c-06f76786cc84))
+    (pin "1" (uuid 32243a41-5f53-4521-bda9-27bbf5197cc2))
+    (pin "2" (uuid 91a7b31b-4cc0-44ad-9b75-543c994e2051))
+    (pin "3" (uuid b2a9b368-bbef-4c8d-a742-c2c3022e5b64))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 59.69 102.87 270) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 193.04 114.3 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7efa97ff-aa1a-4469-81cc-a9013bc9bf87)
+    (property "Reference" "#PWR0110" (id 0) (at 193.04 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 193.04 110.7242 0))
+    (property "Footprint" "" (id 2) (at 193.04 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 193.04 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ea39b1a8-1ede-4d9c-ac10-c7f0e2b26aa1))
+  )
+
+  (symbol (lib_name "D_Zener_1") (lib_id "Device:D_Zener") (at 140.335 130.81 270) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 826d0e3f-f830-4cee-9e41-c8f156726f0e)
-    (property "Reference" "D14" (id 0) (at 62.23 100.965 0)
+    (uuid 8f3790e3-989c-424a-ba9e-be38f8a3d3f9)
+    (property "Reference" "D15" (id 0) (at 142.24 130.81 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "D_Schottky" (id 1) (at 56.515 97.79 0)
+    (property "Value" "D_3.3V" (id 1) (at 142.24 132.715 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 59.69 102.87 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 140.335 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 59.69 102.87 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809191825_LRC-LBZX84C3V3LT1G_C12745.pdf" (id 3) (at 140.335 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 47198473-3d2f-4aff-9b54-36f589391940))
-    (pin "2" (uuid 27b58700-6a3e-4816-b198-b163b14b2c9a))
+    (pin "1" (uuid 8a980b20-01f0-44cc-a328-c1d0eca40bac))
+    (pin "3" (uuid 8d4be93f-1729-4ebb-abaa-4c29ce4ded45))
   )
 
-  (symbol (lib_id "Device:D_Schottky") (at 30.48 102.87 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 98d0a2c4-9242-4a08-9fd6-c4db12d4f787)
-    (property "Reference" "D12" (id 0) (at 33.02 100.965 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "D_Schottky" (id 1) (at 27.305 97.79 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 30.48 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 30.48 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid abd952ba-3068-4364-ad25-8559b59f20b9))
-    (pin "2" (uuid 91ecae58-9fff-4f9a-838d-083f4979ca19))
-  )
-
-  (symbol (lib_id "power:+3.3V") (at 45.085 83.82 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 66.04 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 9b735c5d-05c6-47d6-afc9-23d72572fbb9)
-    (property "Reference" "#PWR?" (id 0) (at 45.085 87.63 0)
+    (uuid 953e0a09-97a9-46a0-84fa-1663ee10f9a3)
+    (property "Reference" "TP?" (id 0) (at 67.437 120.3233 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 67.437 122.8602 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 71.12 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 45.085 80.2442 0))
-    (property "Footprint" "" (id 2) (at 45.085 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 71.12 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 45.085 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 17c4dd0c-920f-456e-b9d0-6375739606ff))
+    (pin "1" (uuid 835ea598-59b0-46ff-b131-a57d432db5b7))
   )
 
-  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 99.06 33.02 0) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 55.245 114.3 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9b22e1ab-8212-4435-9b7a-2b32442ce4c5)
+    (property "Reference" "#PWR0107" (id 0) (at 55.245 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 55.245 110.7242 0))
+    (property "Footprint" "" (id 2) (at 55.245 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 55.245 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 03156049-5511-4890-8984-244b6499b131))
+  )
+
+  (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 146.05 48.26 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ad161a27-3197-4949-9ac1-c576b0cd9b57)
-    (property "Reference" "J14" (id 0) (at 101.092 33.4553 0)
+    (property "Reference" "J14" (id 0) (at 148.082 48.6953 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Screw_Terminal_01x02" (id 1) (at 101.092 35.9922 0)
+    (property "Value" "Screw_Terminal_01x02" (id 1) (at 148.082 51.2322 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 99.06 33.02 0)
+    (property "Footprint" "" (id 2) (at 146.05 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 99.06 33.02 0)
+    (property "Datasheet" "~" (id 3) (at 146.05 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c88972ef-c50c-41ee-bec5-d77d4567d171))
     (pin "2" (uuid 6106a7e6-dd65-4365-92d8-0a5d74884915))
   )
+
+  (symbol (lib_id "Diode:BAT54S") (at 55.245 124.46 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid aecc2cb9-41b9-45be-95ae-71f4428d7e61)
+    (property "Reference" "D12" (id 0) (at 53.34 123.6253 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "BAT54S" (id 1) (at 53.34 126.1622 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 52.07 122.555 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds11005.pdf" (id 3) (at 55.245 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C2762214" (id 4) (at 55.245 124.46 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cf896b85-a510-4470-a092-48003a27efe1))
+    (pin "2" (uuid a74da0db-e335-4c36-b9f4-87d6ac039fe0))
+    (pin "3" (uuid 5496ba29-8262-47cb-b6a4-83ece73f0d89))
+  )
+
+  (symbol (lib_id "power:+3.3V") (at 122.555 114.3 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c322b716-5e7e-4567-b76f-f812077f2500)
+    (property "Reference" "#PWR0105" (id 0) (at 122.555 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 122.555 110.7242 0))
+    (property "Footprint" "" (id 2) (at 122.555 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 122.555 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 95706214-5c6c-4fe6-a678-851b65b6508d))
+  )
+
+  (symbol (lib_id "Device:R") (at 140.335 118.11 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f6ce1f9c-7c08-4662-bf8a-ab784a1c175d)
+    (property "Reference" "R50" (id 0) (at 142.113 117.2753 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 142.113 119.8122 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 138.557 118.11 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 140.335 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 140.335 118.11 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid faa5f24e-fd53-44a2-b7c0-1b5e3365c530))
+    (pin "2" (uuid abc458d5-70d0-42c6-b1fc-7e0db09ff21d))
+  )
+
+  (symbol (lib_id "power:GND") (at 140.335 138.43 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f94cb857-0ce7-4265-a54e-7837b8e1be65)
+    (property "Reference" "#PWR0103" (id 0) (at 140.335 144.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 140.335 142.8734 0))
+    (property "Footprint" "" (id 2) (at 140.335 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 140.335 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c465ea18-479b-41a2-87d5-f5fa6de3041c))
+  )
 )
diff --git a/PCB/FloatPUMP/input_channels.kicad_sch b/PCB/FloatPUMP/input_channels.kicad_sch
index a0e8a8f..54ac935 100644
--- a/PCB/FloatPUMP/input_channels.kicad_sch
+++ b/PCB/FloatPUMP/input_channels.kicad_sch
@@ -92,11 +92,53 @@
         )
       )
     )
-    (symbol "Device:Q_NPN_BCE" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (symbol "Connector:TestPoint_Alt" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint_Alt" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point (alternative shape)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_Alt_0_1"
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy -0.762 3.302)
+            (xy 0 4.064)
+            (xy 0.762 3.302)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "TestPoint_Alt_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Device:Q_NPN_BEC" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Q_NPN_BCE" (id 1) (at 5.08 -1.27 0)
+      (property "Value" "Q_NPN_BEC" (id 1) (at 5.08 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 5.08 2.54 0)
@@ -108,10 +150,10 @@
       (property "ki_keywords" "transistor NPN" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "NPN transistor, base/collector/emitter" (id 5) (at 0 0 0)
+      (property "ki_description" "NPN transistor, base/emitter/collector" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Q_NPN_BCE_0_1"
+      (symbol "Q_NPN_BEC_0_1"
         (polyline
           (pts
             (xy 0.635 0.635)
@@ -154,26 +196,26 @@
           (fill (type none))
         )
       )
-      (symbol "Q_NPN_BCE_1_1"
+      (symbol "Q_NPN_BEC_1_1"
         (pin input line (at -5.08 0 0) (length 5.715)
           (name "B" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
         (pin passive line (at 2.54 -5.08 90) (length 2.54)
           (name "E" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54)
+          (name "C" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
       )
     )
-    (symbol "Device:Q_PMOS_DGS" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (symbol "Device:Q_PMOS_GSD" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Q_PMOS_DGS" (id 1) (at 5.08 -1.27 0)
+      (property "Value" "Q_PMOS_GSD" (id 1) (at 5.08 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 5.08 2.54 0)
@@ -185,10 +227,10 @@
       (property "ki_keywords" "transistor PMOS P-MOS P-MOSFET" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "P-MOSFET transistor, drain/gate/source" (id 5) (at 0 0 0)
+      (property "ki_description" "P-MOSFET transistor, gate/source/drain" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Q_PMOS_DGS_0_1"
+      (symbol "Q_PMOS_GSD_0_1"
         (polyline
           (pts
             (xy 0.254 0)
@@ -299,17 +341,17 @@
           (fill (type outline))
         )
       )
-      (symbol "Q_PMOS_DGS_1_1"
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
+      (symbol "Q_PMOS_GSD_1_1"
         (pin input line (at -5.08 0 0) (length 2.54)
           (name "G" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 2.54 -5.08 90) (length 2.54)
           (name "S" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54)
+          (name "D" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
       )
@@ -549,9 +591,6 @@
   (junction (at 143.51 50.8) (diameter 0) (color 0 0 0 0)
     (uuid 024db40d-e2cf-45ab-bc5b-4d7bbf5d7280)
   )
-  (junction (at 135.89 62.23) (diameter 0) (color 0 0 0 0)
-    (uuid 0d958e2a-926e-4584-b343-5f100da6e56a)
-  )
   (junction (at 158.75 33.02) (diameter 0) (color 0 0 0 0)
     (uuid 10b2b517-56c6-4a5d-9a6a-bf1ada478677)
   )
@@ -564,6 +603,9 @@
   (junction (at 229.87 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 18e5ecd4-5490-4197-bdf3-8d3a4fa4e693)
   )
+  (junction (at 138.43 82.55) (diameter 0) (color 0 0 0 0)
+    (uuid 1c9ad679-f2b1-4f47-8bea-3222a8de63ff)
+  )
   (junction (at 243.84 82.55) (diameter 0) (color 0 0 0 0)
     (uuid 21f95fee-0fa9-412c-b134-d43b9819f05e)
   )
@@ -588,6 +630,9 @@
   (junction (at 243.84 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 589c8274-e17d-4e81-bca5-c12466ad80cd)
   )
+  (junction (at 135.89 62.23) (diameter 0) (color 0 0 0 0)
+    (uuid 64c33a46-c6b1-4a5b-b195-7fcad3c86102)
+  )
   (junction (at 57.15 120.65) (diameter 0) (color 0 0 0 0)
     (uuid 6ff527a7-cb56-4fa0-9e87-9b68667d406a)
   )
@@ -597,9 +642,15 @@
   (junction (at 144.78 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 9d574988-c4e9-4114-8186-139c4e7ae0aa)
   )
+  (junction (at 223.52 82.55) (diameter 0) (color 0 0 0 0)
+    (uuid a1db2bd5-d110-453b-a7c7-9950c61b8308)
+  )
   (junction (at 71.12 34.29) (diameter 0) (color 0 0 0 0)
     (uuid a363f4dc-fcc8-460a-8a29-fdafd52425ca)
   )
+  (junction (at 52.07 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid a7607a86-3c7d-4bf1-a7d2-86f133c70c9d)
+  )
   (junction (at 243.84 93.98) (diameter 0) (color 0 0 0 0)
     (uuid aed03f92-661d-495f-b476-0b002da46dec)
   )
@@ -612,18 +663,18 @@
   (junction (at 71.12 83.82) (diameter 0) (color 0 0 0 0)
     (uuid c4cc643b-63e8-47f7-9186-ef33dbfa93c4)
   )
-  (junction (at 48.26 63.5) (diameter 0) (color 0 0 0 0)
-    (uuid ca2d5258-63a9-406d-809b-f8f6952f3afe)
-  )
   (junction (at 220.98 62.23) (diameter 0) (color 0 0 0 0)
-    (uuid e403e9da-764a-41d1-be64-9171479a837a)
+    (uuid cfe37847-4a25-4970-aedb-3209d27bdfdc)
+  )
+  (junction (at 48.26 63.5) (diameter 0) (color 0 0 0 0)
+    (uuid e0c5d4f2-077c-4dcb-a3c0-8f3391184cb1)
   )
 
   (wire (pts (xy 77.47 85.09) (xy 71.12 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 02aa9662-52ac-45e9-846b-bb306b2c0dd6)
   )
-  (wire (pts (xy 39.37 83.82) (xy 71.12 83.82))
+  (wire (pts (xy 39.37 83.82) (xy 52.07 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 02f82b22-0738-46c7-acc6-18bfbd48b8c5)
   )
@@ -751,6 +802,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 39c64525-1240-4ab4-904e-17ab0ea68a88)
   )
+  (wire (pts (xy 52.07 83.82) (xy 71.12 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3a1fd401-633d-45a3-8d76-7615660f176f)
+  )
   (wire (pts (xy 124.46 62.23) (xy 127 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3b8117d6-7bca-49e0-b84e-68bbd70d39ae)
@@ -803,6 +858,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 542c0083-4184-4443-b185-86b9aca06a07)
   )
+  (wire (pts (xy 223.52 82.55) (xy 243.84 82.55))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 557739c7-3cbb-4226-ad44-80b17e454641)
+  )
   (wire (pts (xy 158.75 55.88) (xy 158.75 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5af5ef4e-62a2-432f-88e2-f476f129a12c)
@@ -899,7 +958,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8b0be69c-85db-4adc-ad1b-95ce9f8a56c3)
   )
-  (wire (pts (xy 212.09 82.55) (xy 243.84 82.55))
+  (wire (pts (xy 212.09 82.55) (xy 223.52 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8f33a218-3aa4-4c42-ba49-d99bde6bae16)
   )
@@ -939,7 +998,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ff40c36-9257-4946-be5c-cb66895cc61c)
   )
-  (wire (pts (xy 127 82.55) (xy 158.75 82.55))
+  (wire (pts (xy 127 82.55) (xy 138.43 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a353ae4e-ca50-4016-9463-ac9d8efe7bb9)
   )
@@ -1067,6 +1126,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid de37a79a-2308-45b6-844d-904ca3cc7107)
   )
+  (wire (pts (xy 138.43 82.55) (xy 158.75 82.55))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e1bb7765-772b-42c8-8515-3f347502ece5)
+  )
   (wire (pts (xy 165.1 83.82) (xy 158.75 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e2abf912-2cb1-47e5-b773-f263972905e4)
@@ -1211,7 +1274,7 @@
     (property "Reference" "R30" (id 0) (at 166.878 88.0653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 166.878 90.6022 0)
+    (property "Value" "nc" (id 1) (at 166.878 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 163.322 88.9 90)
@@ -1230,7 +1293,7 @@
     (property "Reference" "R17" (id 0) (at 58.928 114.7353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 58.928 117.2722 0)
+    (property "Value" "nc" (id 1) (at 58.928 117.2722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 55.372 115.57 90)
@@ -1249,7 +1312,7 @@
     (property "Reference" "R27" (id 0) (at 152.908 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 152.908 116.0022 0)
+    (property "Value" "nc" (id 1) (at 152.908 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 149.352 114.3 90)
@@ -1268,7 +1331,7 @@
     (property "Reference" "R33" (id 0) (at 225.298 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 225.298 116.0022 0)
+    (property "Value" "nc" (id 1) (at 225.298 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 221.742 114.3 90)
@@ -1287,7 +1350,7 @@
     (property "Reference" "R21" (id 0) (at 79.248 89.3353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 79.248 91.8722 0)
+    (property "Value" "nc" (id 1) (at 79.248 91.8722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 75.692 90.17 90)
@@ -1306,7 +1369,7 @@
     (property "Reference" "R39" (id 0) (at 251.968 88.0653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 251.968 90.6022 0)
+    (property "Value" "nc" (id 1) (at 251.968 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 248.412 88.9 90)
@@ -1325,7 +1388,7 @@
     (property "Reference" "R35" (id 0) (at 231.648 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 231.648 116.0022 0)
+    (property "Value" "nc" (id 1) (at 231.648 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 228.092 114.3 90)
@@ -1338,32 +1401,13 @@
     (pin "2" (uuid b148b83f-ea0b-4635-a3b1-ae18a7b34f3e))
   )
 
-  (symbol (lib_id "Device:R") (at 135.89 68.58 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 29dd3ea9-9692-4d3f-8aa4-5f5617ea9601)
-    (property "Reference" "R23" (id 0) (at 137.668 67.7453 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 137.668 70.2822 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 134.112 68.58 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 135.89 68.58 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a72ed386-7196-493a-b9e9-230cb233df26))
-    (pin "2" (uuid 3765b221-f0b7-4dcf-8553-1054e44e5c56))
-  )
-
   (symbol (lib_id "Device:R") (at 152.4 88.9 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2c98be25-824a-48b4-959f-7f54b048fa42)
     (property "Reference" "R28" (id 0) (at 154.178 88.0653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 154.178 90.6022 0)
+    (property "Value" "nc" (id 1) (at 154.178 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 150.622 88.9 90)
@@ -1392,6 +1436,29 @@
     (pin "1" (uuid cdd286bd-8ebd-4bc7-afce-ca652369a36b))
   )
 
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 156.21 50.8 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 3368d284-345a-47d0-8151-2435367c3e55)
+    (property "Reference" "Q5" (id 0) (at 161.417 49.9653 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Q_PMOS_DGS" (id 1) (at 161.417 52.5022 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 161.29 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809291614_Jiangsu-Changjing-Electronics-Technology-Co---Ltd--BSS84_C114481.pdf" (id 3) (at 156.21 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" " C114481" (id 4) (at 156.21 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9311eced-bfc0-4cf5-8297-a8ff95b799c9))
+    (pin "2" (uuid c1ccf7e1-dcb2-477a-9ef1-d2ff2bf4e120))
+    (pin "3" (uuid bb8f58d3-3fab-4d9c-a1db-468d486424a1))
+  )
+
   (symbol (lib_id "power:GND") (at 228.6 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 342a360b-4986-43ca-8330-f76d3670bc4b)
@@ -1414,7 +1481,7 @@
     (property "Reference" "R26" (id 0) (at 146.558 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 146.558 116.0022 0)
+    (property "Value" "nc" (id 1) (at 146.558 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 143.002 114.3 90)
@@ -1433,7 +1500,7 @@
     (property "Reference" "R36" (id 0) (at 237.998 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 237.998 116.0022 0)
+    (property "Value" "nc" (id 1) (at 237.998 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 234.442 114.3 90)
@@ -1446,13 +1513,33 @@
     (pin "2" (uuid f8ee36bd-0561-425f-b295-f9369270d6d1))
   )
 
+  (symbol (lib_id "Device:Q_NPN_BEC") (at 140.97 62.23 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 47df29ed-226f-4269-9555-6d8a506a00c6)
+    (property "Reference" "Q4" (id 0) (at 145.8214 61.3953 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Q_NPN_BCE" (id 1) (at 145.8214 63.9322 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 146.05 59.69 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 140.97 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cdcb7892-f3c5-4651-8b5f-6a4e944414ec))
+    (pin "2" (uuid 4e6cb68c-1a4c-43bf-91dd-5fe8149801a0))
+    (pin "3" (uuid e2d0db01-d360-4b5d-a7e7-40ecfc3e3559))
+  )
+
   (symbol (lib_id "Device:R") (at 237.49 88.9 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 48aacb2f-dae8-46e1-b106-421fcb10106a)
     (property "Reference" "R37" (id 0) (at 239.268 88.0653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 239.268 90.6022 0)
+    (property "Value" "nc" (id 1) (at 239.268 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 235.712 88.9 90)
@@ -1465,7 +1552,7 @@
     (pin "2" (uuid fb6d6ebe-7ee1-4fc3-96bc-68996469c45a))
   )
 
-  (symbol (lib_id "Device:Q_PMOS_DGS") (at 68.58 52.07 0) (mirror x) (unit 1)
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 68.58 52.07 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4963f7f2-81c5-4bf1-a4d0-7bbedd69086e)
     (property "Reference" "Q3" (id 0) (at 73.787 51.2353 0)
@@ -1474,10 +1561,13 @@
     (property "Value" "Q_PMOS_DGS" (id 1) (at 73.787 53.7722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 73.66 54.61 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 73.66 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 68.58 52.07 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809291614_Jiangsu-Changjing-Electronics-Technology-Co---Ltd--BSS84_C114481.pdf" (id 3) (at 68.58 52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" " C114481" (id 4) (at 68.58 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e8fd1d96-1622-487c-8744-b6f922736c58))
@@ -1501,24 +1591,100 @@
     (pin "1" (uuid 8b055065-d5f8-485e-9bd7-e665d0696045))
   )
 
-  (symbol (lib_id "Device:Q_NPN_BCE") (at 226.06 62.23 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 52.07 83.82 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 4fd1bfb4-3b21-41ba-9acc-12c8b615da0c)
+    (uuid 508e44cc-35b0-44d1-99fe-5e9c7e210a72)
+    (property "Reference" "TP?" (id 0) (at 53.467 86.2873 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 53.467 88.8242 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 46.99 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 46.99 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 43e46513-9b23-42c1-8b61-dff6e53353eb))
+  )
+
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 223.52 82.55 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 587de3a7-f11d-4c26-9292-cc29d63dbc05)
+    (property "Reference" "TP?" (id 0) (at 224.917 85.0173 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 224.917 87.5542 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 218.44 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 218.44 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 879c6b8d-d7ee-4145-b7d1-999fc5b35c85))
+  )
+
+  (symbol (lib_id "Device:Q_NPN_BEC") (at 226.06 62.23 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 590c9cf9-1f36-4e8f-8d2d-f68ec921a062)
     (property "Reference" "Q6" (id 0) (at 230.9114 61.3953 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Q_NPN_BCE" (id 1) (at 230.9114 63.9322 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 231.14 59.69 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 231.14 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 226.06 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 05748bec-2827-48c4-9171-e678f26a0cc2))
-    (pin "2" (uuid 3080417d-3d07-4182-9f5a-465068a9318e))
-    (pin "3" (uuid 771684fb-9e1b-41a0-b84c-28371ccc377a))
+    (pin "1" (uuid 95f69d09-7216-4cdf-8b57-06c4f1e536d6))
+    (pin "2" (uuid b3f7ac25-d3f2-4fbf-a294-1453aff089f5))
+    (pin "3" (uuid 5ff59e5c-bcb9-40c5-91ed-fd049a3bc601))
+  )
+
+  (symbol (lib_id "Device:R") (at 215.9 62.23 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5d04f5db-9f04-4d9f-8929-764887fdbd31)
+    (property "Reference" "R31" (id 0) (at 215.9 57.5142 90))
+    (property "Value" "5k" (id 1) (at 215.9 60.0511 90))
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 215.9 64.008 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 215.9 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C332873" (id 4) (at 215.9 62.23 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8cd3aa1b-c19e-4a75-a849-99be74af26a9))
+    (pin "2" (uuid fc1dba8f-08c8-4647-a4d6-eb7e162a8b63))
+  )
+
+  (symbol (lib_id "Device:R") (at 55.88 41.91 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5e751380-65f8-4aa6-b20f-c0d975e0d835)
+    (property "Reference" "R16" (id 0) (at 57.658 41.0753 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 57.658 43.6122 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 54.102 41.91 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 55.88 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 55.88 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cd3ad312-ff35-4723-b666-7bd8ca1d2351))
+    (pin "2" (uuid 0a560fce-c8aa-4f69-b08a-f45231ed66b1))
   )
 
   (symbol (lib_id "power:GND") (at 229.87 123.19 0) (unit 1)
@@ -1553,24 +1719,18 @@
     (pin "1" (uuid 25f1ba8b-5682-49bd-b7ef-3e37db742e2d))
   )
 
-  (symbol (lib_id "Device:Q_NPN_BCE") (at 53.34 63.5 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 143.51 50.8 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 67fcaece-80e9-4f1f-906d-1f4cc110f18b)
-    (property "Reference" "Q2" (id 0) (at 58.1914 62.6653 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Q_NPN_BCE" (id 1) (at 58.1914 65.2022 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 58.42 60.96 0)
+    (uuid 65580d2d-98cd-4177-9e74-9eef9156c010)
+    (property "Reference" "TP?" (id 0) (at 140.208 46.4652 90))
+    (property "Value" "TestPoint_Alt" (id 1) (at 140.208 49.0021 90))
+    (property "Footprint" "" (id 2) (at 143.51 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 53.34 63.5 0)
+    (property "Datasheet" "~" (id 3) (at 143.51 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e53ee822-9ce0-4c9e-bda7-d57119e742b5))
-    (pin "2" (uuid 66d9f1a7-0fdc-4288-97fb-4eb23dd7c85e))
-    (pin "3" (uuid 0c6e35f3-9ddd-413f-ba1b-7a0891cbfafd))
+    (pin "1" (uuid 85be3181-8161-42a2-96b6-86264c4a40a7))
   )
 
   (symbol (lib_id "Device:R") (at 63.5 115.57 0) (unit 1)
@@ -1579,7 +1739,7 @@
     (property "Reference" "R18" (id 0) (at 65.278 114.7353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 65.278 117.2722 0)
+    (property "Value" "nc" (id 1) (at 65.278 117.2722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 61.722 115.57 90)
@@ -1592,21 +1752,6 @@
     (pin "2" (uuid 097d388b-ccff-470f-8de8-c478461002ee))
   )
 
-  (symbol (lib_id "Device:R") (at 215.9 62.23 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6e2fde92-ba6c-4bb2-b681-e3533596fc17)
-    (property "Reference" "R31" (id 0) (at 215.9 57.5142 90))
-    (property "Value" "5k" (id 1) (at 215.9 60.0511 90))
-    (property "Footprint" "" (id 2) (at 215.9 64.008 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 215.9 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6bcefa4a-40b1-47c9-9044-0d89fb44566a))
-    (pin "2" (uuid 28519f44-cbf6-4efd-99f0-c13b27965be7))
-  )
-
   (symbol (lib_id "power:GND") (at 48.26 74.93 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 765125de-629a-41ab-a796-15cea13de36a)
@@ -1639,23 +1784,24 @@
     (pin "1" (uuid 1f635f26-c8d6-4295-a5fb-353354a8e4bc))
   )
 
-  (symbol (lib_id "Device:R") (at 55.88 41.91 0) (unit 1)
+  (symbol (lib_id "Device:Q_NPN_BEC") (at 53.34 63.5 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 81de166e-2b9b-455c-aff8-ed723a59e2f5)
-    (property "Reference" "R16" (id 0) (at 57.658 41.0753 0)
+    (uuid 816c619b-5e67-4269-aac7-42488d5af89f)
+    (property "Reference" "Q2" (id 0) (at 58.1914 62.6653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 57.658 43.6122 0)
+    (property "Value" "Q_NPN_BCE" (id 1) (at 58.1914 65.2022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 54.102 41.91 90)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 58.42 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.88 41.91 0)
+    (property "Datasheet" "~" (id 3) (at 53.34 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid c70c69cb-7b29-4e07-ba2e-b7dee6d3ab4b))
-    (pin "2" (uuid 5d0f6ea1-1e7b-44a8-8107-0cd32fc7feb5))
+    (pin "1" (uuid 5d3b91dd-d292-47e9-8f30-e4ea10e40f31))
+    (pin "2" (uuid d36a0ea9-0258-44f2-bba8-a8fdb5474a20))
+    (pin "3" (uuid 49e94469-c521-4540-8fac-b2e596668947))
   )
 
   (symbol (lib_id "Device:R") (at 50.8 115.57 0) (unit 1)
@@ -1664,7 +1810,7 @@
     (property "Reference" "R15" (id 0) (at 52.578 114.7353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 52.578 117.2722 0)
+    (property "Value" "nc" (id 1) (at 52.578 117.2722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 49.022 115.57 90)
@@ -1677,12 +1823,30 @@
     (pin "2" (uuid b02f8cdc-fbff-4f63-8b78-b1533ebbeb47))
   )
 
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 138.43 82.55 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 880bea86-f923-424f-9f45-bb1f889a74d6)
+    (property "Reference" "TP?" (id 0) (at 139.827 85.0173 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 139.827 87.5542 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 133.35 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 133.35 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fecd4177-4869-4aaa-8689-37575aeceb15))
+  )
+
   (symbol (lib_id "Jumper:SolderJumper_3_Open") (at 71.12 102.87 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8de582c1-e1fd-48cf-b3e5-b5e7006ad8d3)
     (property "Reference" "JP2" (id 0) (at 71.12 105.7894 0))
     (property "Value" "JPShunt" (id 1) (at 71.12 108.3263 0))
-    (property "Footprint" "" (id 2) (at 71.12 102.87 0)
+    (property "Footprint" "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels" (id 2) (at 71.12 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 71.12 102.87 0)
@@ -1693,19 +1857,18 @@
     (pin "3" (uuid 8ce1d73c-c155-4636-8f10-dfa7845971f0))
   )
 
-  (symbol (lib_id "Device:R") (at 130.81 62.23 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 55.88 52.07 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 908ce167-3d05-49cd-8154-ff63081b0b88)
-    (property "Reference" "R22" (id 0) (at 130.81 57.5142 90))
-    (property "Value" "5k" (id 1) (at 130.81 60.0511 90))
-    (property "Footprint" "" (id 2) (at 130.81 64.008 90)
+    (uuid 91c2a95c-b74a-49c5-9e1e-554121cba191)
+    (property "Reference" "TP?" (id 0) (at 52.578 47.7352 90))
+    (property "Value" "TestPoint_Alt" (id 1) (at 52.578 50.2721 90))
+    (property "Footprint" "" (id 2) (at 55.88 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 130.81 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 55.88 46.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9b721d25-327f-4809-aced-3e783df3304d))
-    (pin "2" (uuid 28ba96d4-4b73-4c13-b2bf-8fbbd4e06379))
+    (pin "1" (uuid 40c6259e-9b23-4397-9fbf-20372201a0f6))
   )
 
   (symbol (lib_id "power:GND") (at 80.01 114.3 0) (unit 1)
@@ -1740,23 +1903,48 @@
     (pin "1" (uuid 52e77b22-b646-42d7-9ce4-d7ae460153a5))
   )
 
-  (symbol (lib_id "Device:R") (at 143.51 40.64 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 220.98 68.58 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 96da55e6-c92f-4afa-8e20-0f557493f0a5)
-    (property "Reference" "R25" (id 0) (at 145.288 39.8053 0)
+    (uuid 9585ccc1-f8fc-4e33-9422-1d2238b71fc6)
+    (property "Reference" "R32" (id 0) (at 222.758 67.7453 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 145.288 42.3422 0)
+    (property "Value" "10k" (id 1) (at 222.758 70.2822 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 141.732 40.64 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 219.202 68.58 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 143.51 40.64 0)
+    (property "Datasheet" "~" (id 3) (at 220.98 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 65eacba3-88bc-4d1a-af4f-4903355e1372))
-    (pin "2" (uuid e48d3e29-a7c2-455b-9491-8fb57182cf2d))
+    (property "JLCPCB" "C238881" (id 4) (at 220.98 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid df5b542f-5f73-4776-8283-e4146c8b1b90))
+    (pin "2" (uuid 946378ec-65dd-46cc-aead-959d6e6cab76))
+  )
+
+  (symbol (lib_id "Device:R") (at 135.89 68.58 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 95f17206-bd5b-46e2-806f-72b8d3e69660)
+    (property "Reference" "R23" (id 0) (at 137.668 67.7453 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 137.668 70.2822 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 134.112 68.58 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 135.89 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 135.89 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e249b934-343f-4930-9990-b3e48da3997f))
+    (pin "2" (uuid 66f82fb1-db42-4776-b506-074679392805))
   )
 
   (symbol (lib_id "Device:R") (at 158.75 88.9 0) (unit 1)
@@ -1768,7 +1956,7 @@
     (property "Value" "165" (id 1) (at 160.528 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 156.972 88.9 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 156.972 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 158.75 88.9 0)
@@ -1797,33 +1985,13 @@
     (pin "2" (uuid 8d5928f5-3357-45e9-bc80-7563df02becc))
   )
 
-  (symbol (lib_id "Device:Q_PMOS_DGS") (at 156.21 50.8 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 9f759071-67ea-43aa-8748-dbab07b9cd02)
-    (property "Reference" "Q5" (id 0) (at 161.417 49.9653 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Q_PMOS_DGS" (id 1) (at 161.417 52.5022 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 161.29 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 156.21 50.8 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0b5c6dcf-2075-43ce-9c09-f92763dfd827))
-    (pin "2" (uuid 620467fb-7456-4402-b8f5-f23c4163261d))
-    (pin "3" (uuid fc3f6906-5e4d-4762-8ecc-3743e69b487d))
-  )
-
   (symbol (lib_id "Device:R") (at 138.43 114.3 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2b67eac-1149-49df-91e2-f6341c4c4450)
     (property "Reference" "R24" (id 0) (at 140.208 113.4653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 140.208 116.0022 0)
+    (property "Value" "nc" (id 1) (at 140.208 116.0022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 136.652 114.3 90)
@@ -1836,25 +2004,6 @@
     (pin "2" (uuid 7afc70dd-286e-47b5-88dc-5975c5dcaaa5))
   )
 
-  (symbol (lib_id "Device:R") (at 228.6 40.64 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a51be299-57ae-44a3-a788-1671ca07a9cf)
-    (property "Reference" "R34" (id 0) (at 230.378 39.8053 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 230.378 42.3422 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 226.822 40.64 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 228.6 40.64 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 770c46b2-43a8-4238-bb0d-9023353e517c))
-    (pin "2" (uuid 489aae5e-9cbe-4d8e-acf4-7abaa04a5b8c))
-  )
-
   (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 171.45 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a57c6264-f1b0-4370-8782-822f3e685f7d)
@@ -1874,6 +2023,28 @@
     (pin "2" (uuid 1c74e9bb-d5f6-4338-9518-a388341bddff))
   )
 
+  (symbol (lib_id "Device:R") (at 48.26 69.85 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a595e187-c458-40ca-83c7-ec8e11809a48)
+    (property "Reference" "R14" (id 0) (at 50.038 69.0153 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 50.038 71.5522 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 46.482 69.85 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 48563e78-55c4-4bcf-8f54-2de27abfcc5e))
+    (pin "2" (uuid 2bdd869c-b214-4358-a077-edeab305eb76))
+  )
+
   (symbol (lib_id "power:GND") (at 57.15 124.46 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a9969353-83e1-4424-b775-c98a7fc1dc21)
@@ -1899,7 +2070,7 @@
     (property "Value" "165" (id 1) (at 245.618 90.6022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 242.062 88.9 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 242.062 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 243.84 88.9 0)
@@ -1914,7 +2085,7 @@
     (uuid aecc8acb-304f-4903-96d6-4b8584bca982)
     (property "Reference" "JP4" (id 0) (at 243.84 104.5194 0))
     (property "Value" "JPShunt" (id 1) (at 243.84 107.0563 0))
-    (property "Footprint" "" (id 2) (at 243.84 101.6 0)
+    (property "Footprint" "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels" (id 2) (at 243.84 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 243.84 101.6 0)
@@ -1925,25 +2096,6 @@
     (pin "3" (uuid dc6d92d2-7990-46af-a359-73a24f22f3bb))
   )
 
-  (symbol (lib_id "Device:R") (at 220.98 68.58 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b3362e2f-0473-4060-a579-068edbb6cbe1)
-    (property "Reference" "R32" (id 0) (at 222.758 67.7453 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 222.758 70.2822 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 219.202 68.58 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 220.98 68.58 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f0fa0d06-1664-4152-a0a9-f69fc2e833e7))
-    (pin "2" (uuid a08ebcd2-6544-4257-85cb-16c65b3fccb3))
-  )
-
   (symbol (lib_id "Device:R") (at 71.12 90.17 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b4b12788-783e-4f20-8430-6ebbe7a38a64)
@@ -1953,7 +2105,7 @@
     (property "Value" "165" (id 1) (at 72.898 91.8722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 69.342 90.17 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 69.342 90.17 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 71.12 90.17 0)
@@ -1982,24 +2134,45 @@
     (pin "2" (uuid 26bfc406-f7d4-40a3-847a-c0ff0da646dc))
   )
 
-  (symbol (lib_id "Device:Q_PMOS_DGS") (at 241.3 50.8 0) (mirror x) (unit 1)
+  (symbol (lib_id "Device:R") (at 130.81 62.23 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c25af5d5-4f2b-4d0f-ac67-9eb953275646)
+    (uuid c0be57d3-0253-4b97-b875-081ea6a42ed0)
+    (property "Reference" "R22" (id 0) (at 130.81 57.5142 90))
+    (property "Value" "5k" (id 1) (at 130.81 60.0511 90))
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 130.81 64.008 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 130.81 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C332873" (id 4) (at 130.81 62.23 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f686037d-dd9e-4cd2-8b70-f61fcebad470))
+    (pin "2" (uuid f14ec7ab-eee3-4432-903a-789e99447d27))
+  )
+
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 241.3 50.8 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c14d41e5-e037-4449-9e9d-68def22bcfdd)
     (property "Reference" "Q7" (id 0) (at 246.507 49.9653 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Q_PMOS_DGS" (id 1) (at 246.507 52.5022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 246.38 53.34 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 246.38 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 241.3 50.8 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809291614_Jiangsu-Changjing-Electronics-Technology-Co---Ltd--BSS84_C114481.pdf" (id 3) (at 241.3 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8c4644f8-f65d-4b94-b2dc-ede6fa0091c3))
-    (pin "2" (uuid 324c7d29-2895-4785-9744-715f80b1fd01))
-    (pin "3" (uuid 62cd44f4-74ab-4c94-a260-7caef72e0f6b))
+    (property "JLCPCB" " C114481" (id 4) (at 241.3 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 408d131b-d082-4a1d-ae80-062b42ed7936))
+    (pin "2" (uuid 1f4b26e4-e078-4452-900e-85ad359ba4e2))
+    (pin "3" (uuid 5bf17078-e0c2-488c-a177-7ca8b1f5f535))
   )
 
   (symbol (lib_id "power:GND") (at 144.78 123.19 0) (unit 1)
@@ -2023,7 +2196,7 @@
     (uuid c777561f-ad51-4045-bcba-eac30c38eb2b)
     (property "Reference" "JP3" (id 0) (at 158.75 104.5194 0))
     (property "Value" "JPShunt" (id 1) (at 158.75 107.0563 0))
-    (property "Footprint" "" (id 2) (at 158.75 101.6 0)
+    (property "Footprint" "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm_NumberLabels" (id 2) (at 158.75 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 158.75 101.6 0)
@@ -2050,43 +2223,40 @@
     (pin "1" (uuid 2eb6bcd7-e6ba-4e5d-8776-6e180532ebef))
   )
 
-  (symbol (lib_id "Device:Q_NPN_BCE") (at 140.97 62.23 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 228.6 50.8 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid cac17ed7-f2ee-4369-9871-90c5115f1b3e)
-    (property "Reference" "Q4" (id 0) (at 145.8214 61.3953 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Q_NPN_BCE" (id 1) (at 145.8214 63.9322 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 146.05 59.69 0)
+    (uuid cd3f23e6-104f-4b44-b10f-7b1375df02ab)
+    (property "Reference" "TP?" (id 0) (at 225.298 46.4652 90))
+    (property "Value" "TestPoint_Alt" (id 1) (at 225.298 49.0021 90))
+    (property "Footprint" "" (id 2) (at 228.6 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 140.97 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 228.6 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9ce3fbdd-304a-473d-8b0c-c0abb6d4bca6))
-    (pin "2" (uuid 037f573b-e153-4c2f-aa81-3f10404d5fb3))
-    (pin "3" (uuid 5ba97574-7ead-4349-8d9b-1dace3a846f8))
+    (pin "1" (uuid 19b26d50-28cd-47f0-9ea2-dd1b69173461))
   )
 
-  (symbol (lib_id "Device:R") (at 48.26 69.85 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 228.6 40.64 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid eb402657-1599-4663-87ee-d5359227e6dd)
-    (property "Reference" "R14" (id 0) (at 50.038 69.0153 0)
+    (uuid ecc13ab2-1692-49d9-b09f-276a8a7a64af)
+    (property "Reference" "R34" (id 0) (at 230.378 39.8053 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 50.038 71.5522 0)
+    (property "Value" "10k" (id 1) (at 230.378 42.3422 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 46.482 69.85 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 226.822 40.64 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 48.26 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 228.6 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a9d18d08-a426-4b15-9a82-6e885c64df20))
-    (pin "2" (uuid 424579cd-829b-4417-9abc-9b9b48ab6e4f))
+    (property "JLCPCB" "C238881" (id 4) (at 228.6 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 75a22e1a-e2b8-42ad-aaaa-e89d8d4bca08))
+    (pin "2" (uuid 1504c474-6a03-47c3-aa0d-e249bfdc1c75))
   )
 
   (symbol (lib_id "power:GND") (at 55.88 74.93 0) (unit 1)
@@ -2111,7 +2281,7 @@
     (property "Reference" "R19" (id 0) (at 66.548 89.3353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "R" (id 1) (at 66.548 91.8722 0)
+    (property "Value" "nc" (id 1) (at 66.548 91.8722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 62.992 90.17 90)
@@ -2129,13 +2299,38 @@
     (uuid fd8b021d-0ad2-45ef-b732-11349f404019)
     (property "Reference" "R13" (id 0) (at 43.18 58.7842 90))
     (property "Value" "5k" (id 1) (at 43.18 61.3211 90))
-    (property "Footprint" "" (id 2) (at 43.18 65.278 90)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 43.18 65.278 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 43.18 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C332873" (id 4) (at 43.18 63.5 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 3f4b52d2-6d6a-4ff2-a49f-b931219f6426))
     (pin "2" (uuid af36c7f5-4068-4891-9357-2a58190f1850))
   )
+
+  (symbol (lib_id "Device:R") (at 143.51 40.64 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid fe7dc4cf-059b-43d8-9aa4-dd252426165b)
+    (property "Reference" "R25" (id 0) (at 145.288 39.8053 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 145.288 42.3422 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 141.732 40.64 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 143.51 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 143.51 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 26bfddd0-65a6-4be9-b225-632f6d837637))
+    (pin "2" (uuid b37a1be4-2ec2-4dce-9730-fc36524f7f02))
+  )
 )
diff --git a/PCB/FloatPUMP/output_channels.kicad_sch b/PCB/FloatPUMP/output_channels.kicad_sch
index 870017c..ea321d1 100644
--- a/PCB/FloatPUMP/output_channels.kicad_sch
+++ b/PCB/FloatPUMP/output_channels.kicad_sch
@@ -92,6 +92,48 @@
         )
       )
     )
+    (symbol "Connector:TestPoint_Alt" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint_Alt" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point (alternative shape)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_Alt_0_1"
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy -0.762 3.302)
+            (xy 0 4.064)
+            (xy 0.762 3.302)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "TestPoint_Alt_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:D" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "D" (id 0) (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
@@ -236,11 +278,11 @@
         )
       )
     )
-    (symbol "Device:Q_NMOS_DGS" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (symbol "Device:Q_NMOS_GSD" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Q_NMOS_DGS" (id 1) (at 5.08 -1.27 0)
+      (property "Value" "Q_NMOS_GSD" (id 1) (at 5.08 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 5.08 2.54 0)
@@ -252,10 +294,10 @@
       (property "ki_keywords" "transistor NMOS N-MOS N-MOSFET" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "N-MOSFET transistor, drain/gate/source" (id 5) (at 0 0 0)
+      (property "ki_description" "N-MOSFET transistor, gate/source/drain" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Q_NMOS_DGS_0_1"
+      (symbol "Q_NMOS_GSD_0_1"
         (polyline
           (pts
             (xy 0.254 0)
@@ -366,17 +408,17 @@
           (fill (type outline))
         )
       )
-      (symbol "Q_NMOS_DGS_1_1"
-        (pin passive line (at 2.54 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
+      (symbol "Q_NMOS_GSD_1_1"
         (pin input line (at -5.08 0 0) (length 2.54)
           (name "G" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 2.54 -5.08 90) (length 2.54)
           (name "S" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54)
+          (name "D" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
       )
@@ -820,6 +862,11 @@
     (uuid fdb04aed-1eec-4626-81d5-d969bec49835)
   )
 
+  (text " hier ptc als sicherung?" (at 33.02 36.83 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 76205554-2de3-4e4c-a773-99275cbf9394)
+  )
+
   (hierarchical_label "OUT1" (shape input) (at 102.87 83.82 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0284a2fd-581c-40d8-82d4-8d826f160fe6)
@@ -881,23 +928,22 @@
     (pin "1" (uuid 737dfc0f-9d4a-4e39-8548-ca70d57b8b46))
   )
 
-  (symbol (lib_id "Device:R") (at 38.1 53.34 0) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 119.38 83.82 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 075595fa-e1c7-4879-9416-4a2fb8916bc1)
-    (property "Reference" "R40" (id 0) (at 39.878 52.5053 0)
+    (uuid 1069d6d6-c785-4085-8ce1-db9635c7ac31)
+    (property "Reference" "TP?" (id 0) (at 120.777 79.6833 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1k" (id 1) (at 39.878 55.0422 0)
+    (property "Value" "TestPoint_Alt" (id 1) (at 120.777 82.2202 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 36.322 53.34 90)
+    (property "Footprint" "" (id 2) (at 124.46 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 38.1 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 124.46 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0ceb8822-b6f1-4b95-ae93-cb2639221ac0))
-    (pin "2" (uuid ebf26173-50fa-4d1b-a036-5bc12a6642e1))
+    (pin "1" (uuid f7aa4b0b-5577-4768-866e-3043c9e8374a))
   )
 
   (symbol (lib_id "power:+5V") (at 177.8 49.53 0) (unit 1)
@@ -916,6 +962,46 @@
     (pin "1" (uuid 10f5d306-b592-4ed5-a9cd-b3b93bff3241))
   )
 
+  (symbol (lib_id "Device:R") (at 113.03 83.82 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 22e05d06-cfb5-4d0d-a42e-ef4d90993a6b)
+    (property "Reference" "R44" (id 0) (at 113.03 79.1042 90))
+    (property "Value" "1k" (id 1) (at 113.03 81.6411 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 113.03 85.598 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 113.03 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 113.03 83.82 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b4230853-cded-49ad-9da7-a6eab79262d2))
+    (pin "2" (uuid 5c6df20e-c8da-4a75-9dd1-fa900cdee37c))
+  )
+
+  (symbol (lib_id "Device:D") (at 191.77 62.23 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 2ced2b81-6ead-4d2f-876b-e2b734b0ea86)
+    (property "Reference" "D9" (id 0) (at 193.802 61.3953 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "D" (id 1) (at 193.802 63.9322 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SMA" (id 2) (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/2109061630_YONGYUTAI-1N4001_C2892670.pdf" (id 3) (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C2892670" (id 4) (at 191.77 62.23 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e35f5808-3731-4597-a411-25999189d85b))
+    (pin "2" (uuid c02fca96-663a-4390-b3e0-16213898ee23))
+  )
+
   (symbol (lib_id "Device:D") (at 52.07 62.23 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 365f756e-8202-4285-9846-eccbb1392d36)
@@ -925,29 +1011,53 @@
     (property "Value" "D" (id 1) (at 54.102 63.9322 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 52.07 62.23 0)
+    (property "Footprint" "Diode_SMD:D_SMA" (id 2) (at 52.07 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 52.07 62.23 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/2109061630_YONGYUTAI-1N4001_C2892670.pdf" (id 3) (at 52.07 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C2892670" (id 4) (at 52.07 62.23 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 30d24dc1-77d2-4d0b-8a5f-eaee079549cf))
     (pin "2" (uuid 97f96ed1-b6c1-46be-a177-131e9dc18e4f))
   )
 
-  (symbol (lib_id "Device:R") (at 113.03 83.82 90) (unit 1)
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 190.5 83.82 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 3b29c90f-2771-4827-b14d-ce95a51f60d5)
-    (property "Reference" "R44" (id 0) (at 113.03 79.1042 90))
-    (property "Value" "1k" (id 1) (at 113.03 81.6411 90))
-    (property "Footprint" "" (id 2) (at 113.03 85.598 90)
+    (uuid 455c1377-71f5-445b-a375-aab2c1166db6)
+    (property "Reference" "TP?" (id 0) (at 191.897 79.6833 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 191.897 82.2202 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 195.58 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 113.03 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 195.58 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 857766bc-acec-474d-87fc-faa11db7de73))
-    (pin "2" (uuid c027b9c3-8d96-4122-a239-d39652c78b11))
+    (pin "1" (uuid 7cb1e085-69f3-4258-9de6-bcd3ae9a062c))
+  )
+
+  (symbol (lib_id "Device:R") (at 184.15 83.82 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 4733dc44-c57e-42ed-8b1d-0c36d40cbb92)
+    (property "Reference" "R47" (id 0) (at 184.15 79.1042 90))
+    (property "Value" "1k" (id 1) (at 184.15 81.6411 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 184.15 85.598 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 184.15 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 184.15 83.82 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2304a403-4cb7-492b-8961-594df8f60d8a))
+    (pin "2" (uuid f3903df5-0dc1-44e6-99c3-1a3c9d9c4de6))
   )
 
   (symbol (lib_id "power:+5V") (at 106.68 49.53 0) (unit 1)
@@ -982,6 +1092,69 @@
     (pin "1" (uuid 24a91d4d-4a37-478a-a8a6-b0d9da915a6e))
   )
 
+  (symbol (lib_id "Device:D") (at 120.65 62.23 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5cee2b56-faec-46ca-a30e-95c12581d89e)
+    (property "Reference" "D5" (id 0) (at 122.682 61.3953 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "D" (id 1) (at 122.682 63.9322 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SMA" (id 2) (at 120.65 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/2109061630_YONGYUTAI-1N4001_C2892670.pdf" (id 3) (at 120.65 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C2892670" (id 4) (at 120.65 62.23 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d30048f8-ae32-4120-9dfe-e4bedafb8a97))
+    (pin "2" (uuid 5c66b8de-2995-4932-b2e3-f2b07db708b7))
+  )
+
+  (symbol (lib_id "Device:Q_NMOS_GSD") (at 198.12 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5d9b171f-c945-4d92-8fc9-ff4addcb437a)
+    (property "Reference" "Q10" (id 0) (at 203.327 82.9853 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Q_NMOS_DGS" (id 1) (at 203.327 85.5222 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 203.2 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1810271831_TOSHIBA-T2N7002BK-LM_C146372.pdf" (id 3) (at 198.12 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C146372" (id 4) (at 198.12 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c5a7d1ec-abc2-4cf6-8052-bafde4120630))
+    (pin "2" (uuid 918cfc86-9056-449d-bb53-6ee84ac2c624))
+    (pin "3" (uuid 138bb852-f822-4ea0-94f7-413105316f17))
+  )
+
+  (symbol (lib_id "Connector:TestPoint_Alt") (at 50.8 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5efd494a-6297-4616-b517-9366ed4846cf)
+    (property "Reference" "TP?" (id 0) (at 52.197 79.6833 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TestPoint_Alt" (id 1) (at 52.197 82.2202 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 55.88 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 55.88 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e9937d8c-b915-4364-a233-72ad0c0e7e29))
+  )
+
   (symbol (lib_id "Device:LED") (at 106.68 60.96 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 61694e91-4168-4c8f-b51f-fc549ac4a37e)
@@ -991,7 +1164,7 @@
     (property "Value" "LED" (id 1) (at 109.601 64.2497 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 106.68 60.96 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 106.68 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 106.68 60.96 0)
@@ -1026,7 +1199,7 @@
     (property "Value" "LED" (id 1) (at 180.721 64.2497 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 177.8 60.96 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 177.8 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 177.8 60.96 0)
@@ -1036,76 +1209,26 @@
     (pin "2" (uuid f16f5e2d-f6cd-45c3-bcc9-182418722783))
   )
 
-  (symbol (lib_id "Device:R") (at 190.5 90.17 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 106.68 53.34 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6919cc5d-8faf-4fe1-82f6-4039bfae5247)
-    (property "Reference" "R48" (id 0) (at 192.278 89.3353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 6f9ca678-db16-4a38-bb5d-9a78a78c8efb)
+    (property "Reference" "R43" (id 0) (at 108.458 52.5053 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "10k" (id 1) (at 192.278 91.8722 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "1k" (id 1) (at 108.458 55.0422 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 188.722 90.17 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 108.458 53.34 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 190.5 90.17 0)
+    (property "Datasheet" "~" (id 3) (at 106.68 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f2e3d922-3739-482e-b7db-6664fdd90f9b))
-    (pin "2" (uuid 4f07bc49-badc-41b2-8c9f-af6da753effd))
-  )
-
-  (symbol (lib_id "Device:R") (at 184.15 83.82 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6cea7f3e-24f5-4a51-82f8-1c0b7dd66685)
-    (property "Reference" "R47" (id 0) (at 184.15 79.1042 90))
-    (property "Value" "1k" (id 1) (at 184.15 81.6411 90))
-    (property "Footprint" "" (id 2) (at 184.15 85.598 90)
+    (property "JLCPCB" "C328340" (id 4) (at 106.68 53.34 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 184.15 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1cf7ef70-1158-4933-894c-9c2c748a2655))
-    (pin "2" (uuid 3e5d11f5-d680-4f4f-8125-40c99dd7dea5))
-  )
-
-  (symbol (lib_id "Device:R") (at 50.8 90.17 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 6d3d3847-e476-4c87-9ad6-88ca18d8272c)
-    (property "Reference" "R42" (id 0) (at 52.578 89.3353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 52.578 91.8722 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 49.022 90.17 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 50.8 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 87cead25-6742-438e-9629-6ab8ae90809a))
-    (pin "2" (uuid 224ba778-c225-47d5-b6b9-afd4b68743ae))
-  )
-
-  (symbol (lib_id "Device:R") (at 177.8 53.34 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 7201553a-1338-4c18-ba81-d887a4b2fcdd)
-    (property "Reference" "R46" (id 0) (at 179.578 52.5053 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1k" (id 1) (at 179.578 55.0422 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 176.022 53.34 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 177.8 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 8be2f24f-2563-426a-bb05-0537fc3f69d2))
-    (pin "2" (uuid a5bd89ae-7c8e-45ec-bf05-d94139cbe422))
+    (pin "1" (uuid 95fafdaf-c170-45e6-8f5e-b809b2c8061d))
+    (pin "2" (uuid 26446737-8aff-472b-a32e-eb0cb009f311))
   )
 
   (symbol (lib_id "power:GND") (at 129.54 100.33 0) (unit 1)
@@ -1133,7 +1256,7 @@
     (property "Value" "LED" (id 1) (at 41.021 64.2497 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 38.1 60.96 0)
+    (property "Footprint" "LED_SMD:LED_0805_2012Metric" (id 2) (at 38.1 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 38.1 60.96 0)
@@ -1143,7 +1266,7 @@
     (pin "2" (uuid 73abdf60-783c-4bb4-bc5b-550a36509a7c))
   )
 
-  (symbol (lib_id "Device:Q_NMOS_DGS") (at 58.42 83.82 0) (unit 1)
+  (symbol (lib_id "Device:Q_NMOS_GSD") (at 58.42 83.82 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 80ccbe92-8094-47d3-b408-c9f6b7f81d69)
     (property "Reference" "Q8" (id 0) (at 63.627 82.9853 0)
@@ -1152,10 +1275,13 @@
     (property "Value" "Q_NMOS_DGS" (id 1) (at 63.627 85.5222 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 63.5 81.28 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 63.5 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 58.42 83.82 0)
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1810271831_TOSHIBA-T2N7002BK-LM_C146372.pdf" (id 3) (at 58.42 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C146372" (id 4) (at 58.42 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b66c1801-9d9a-4721-8804-3917262701e1))
@@ -1179,23 +1305,49 @@
     (pin "1" (uuid 9b6bcc8c-d11c-4c54-ac5b-95eecdbf22f7))
   )
 
-  (symbol (lib_id "Device:D") (at 191.77 62.23 270) (unit 1)
+  (symbol (lib_id "Device:R") (at 38.1 53.34 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 93d28f2f-7c53-4174-abf5-99ae6c642e9e)
-    (property "Reference" "D11" (id 0) (at 193.802 61.3953 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 938d0f9e-4f4a-44d3-8851-441d60ef9864)
+    (property "Reference" "R40" (id 0) (at 39.878 52.5053 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "D" (id 1) (at 193.802 63.9322 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "1k" (id 1) (at 39.878 55.0422 0)
+      (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 191.77 62.23 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 39.878 53.34 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 191.77 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 38.1 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid efc04d62-c146-4274-9f68-fe8068dfca67))
-    (pin "2" (uuid cba6853d-363a-47a5-976a-50c2464aacdc))
+    (property "JLCPCB" "C328340" (id 4) (at 38.1 53.34 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8e3a7fc0-b449-4820-81b3-fac3284e8406))
+    (pin "2" (uuid 560b2177-0eb8-4a9f-97af-a9a55e1207d0))
+  )
+
+  (symbol (lib_id "Device:Q_NMOS_GSD") (at 127 83.82 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9f1254c7-673a-43f9-a86d-b5ad051b67e0)
+    (property "Reference" "Q9" (id 0) (at 132.207 82.9853 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Q_NMOS_DGS" (id 1) (at 132.207 85.5222 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 132.08 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1810271831_TOSHIBA-T2N7002BK-LM_C146372.pdf" (id 3) (at 127 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C146372" (id 4) (at 127 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3de9a452-d98d-4562-b85d-652e47dcdbae))
+    (pin "2" (uuid 1bffb40d-5a5f-4fac-8581-4e865ed1a389))
+    (pin "3" (uuid 8ca837ea-ea09-4402-b03a-4652c9b50ad3))
   )
 
   (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 138.43 60.96 0) (unit 1)
@@ -1271,6 +1423,50 @@
     (pin "2" (uuid b15a3c5b-07a5-4a73-bb85-56f981534a0f))
   )
 
+  (symbol (lib_id "Device:R") (at 50.8 90.17 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid ac25ff94-2aad-42fe-be65-13f2f4692194)
+    (property "Reference" "R42" (id 0) (at 52.578 89.3353 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 52.578 91.8722 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 49.022 90.17 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 50.8 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 50.8 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d97c7862-ba9e-4847-bbd7-98e39b637f7c))
+    (pin "2" (uuid 57ebc3a1-5ea3-4658-8ca3-b21659e2daa3))
+  )
+
+  (symbol (lib_id "Device:R") (at 119.38 90.17 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b27330a2-6726-47c5-8c2c-5037384a5d88)
+    (property "Reference" "R45" (id 0) (at 121.158 89.3353 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 121.158 91.8722 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 117.602 90.17 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 119.38 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C238881" (id 4) (at 119.38 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 45f2269b-7efb-47e6-9c8a-73aea1b3bfa7))
+    (pin "2" (uuid 46df60c1-e8de-4e58-b741-13560e8c45d3))
+  )
+
   (symbol (lib_id "power:+24V") (at 200.66 49.53 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba45537b-f717-4f2c-9b78-cd580f1398a5)
@@ -1287,116 +1483,26 @@
     (pin "1" (uuid 34e79b6a-6e59-496e-95b0-569d1f1dba8a))
   )
 
-  (symbol (lib_id "Device:Q_NMOS_DGS") (at 198.12 83.82 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 190.5 90.17 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid be4f1d0b-48c1-4267-9745-49fb3c38df3d)
-    (property "Reference" "Q10" (id 0) (at 203.327 82.9853 0)
+    (uuid cffba7df-18aa-4f42-bc57-59e9221fbf95)
+    (property "Reference" "R48" (id 0) (at 192.278 89.3353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Q_NMOS_DGS" (id 1) (at 203.327 85.5222 0)
+    (property "Value" "10k" (id 1) (at 192.278 91.8722 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 203.2 81.28 0)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 188.722 90.17 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 198.12 83.82 0)
+    (property "Datasheet" "~" (id 3) (at 190.5 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 35c08807-ec86-460c-aa2d-e1003df0b743))
-    (pin "2" (uuid 30ab2820-8457-487c-b9b8-28a62318933b))
-    (pin "3" (uuid 74c8feea-bba9-4350-82c6-0b52609ffa23))
-  )
-
-  (symbol (lib_id "Device:Q_NMOS_DGS") (at 127 83.82 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c3536c43-613b-42e8-810d-2980e5599493)
-    (property "Reference" "Q9" (id 0) (at 132.207 82.9853 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Q_NMOS_DGS" (id 1) (at 132.207 85.5222 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 132.08 81.28 0)
+    (property "JLCPCB" "C238881" (id 4) (at 190.5 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 127 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1c95ce49-ec91-40b6-92fd-63e1c59cf132))
-    (pin "2" (uuid fab75cdb-f733-482e-a31a-568507a7b874))
-    (pin "3" (uuid 9a7d3811-6b06-4b62-aec4-bc6e6da6d958))
-  )
-
-  (symbol (lib_id "Device:R") (at 119.38 90.17 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid c49287dc-2325-499e-8db1-b6780277c7e6)
-    (property "Reference" "R45" (id 0) (at 121.158 89.3353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 121.158 91.8722 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 117.602 90.17 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 119.38 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid af651d79-0b04-4dd8-8724-d0907a0cb257))
-    (pin "2" (uuid 5975cb26-89b7-40e2-90ad-97da02080746))
-  )
-
-  (symbol (lib_id "Device:D") (at 120.65 62.23 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d366181a-ea7c-4d9b-978f-206ef0feccbe)
-    (property "Reference" "D9" (id 0) (at 122.682 61.3953 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "D" (id 1) (at 122.682 63.9322 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 120.65 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 120.65 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d0149731-49aa-4646-bc9a-278d893c008a))
-    (pin "2" (uuid 9447aca2-1466-4d7e-92ac-7d09c2c23e89))
-  )
-
-  (symbol (lib_id "Device:R") (at 44.45 83.82 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid d3cf5d7b-3d54-403b-a65d-348faf3cd92e)
-    (property "Reference" "R41" (id 0) (at 44.45 79.1042 90))
-    (property "Value" "1k" (id 1) (at 44.45 81.6411 90))
-    (property "Footprint" "" (id 2) (at 44.45 85.598 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 44.45 83.82 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0ec02f6c-1140-4fcb-9a07-ac5defded99e))
-    (pin "2" (uuid a0c5585e-82fb-49c6-9f1f-891dea4fef70))
-  )
-
-  (symbol (lib_id "Device:R") (at 106.68 53.34 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid e4c515ca-03d0-4892-9aa6-74262c35e750)
-    (property "Reference" "R43" (id 0) (at 108.458 52.5053 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1k" (id 1) (at 108.458 55.0422 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 104.902 53.34 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 106.68 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e64053ee-eb68-4da7-b94c-dede451d570c))
-    (pin "2" (uuid df3dcc25-1230-4156-8400-15ce8a4c518b))
+    (pin "1" (uuid 8f801ec5-9c56-471c-893a-a7e0986591a3))
+    (pin "2" (uuid 80947766-dfe4-4cc5-beb5-0eec58588ea8))
   )
 
   (symbol (lib_id "power:GND") (at 190.5 100.33 0) (unit 1)
@@ -1414,4 +1520,44 @@
     )
     (pin "1" (uuid 590dc7f8-f4e0-47a9-8d99-ad9247bf9485))
   )
+
+  (symbol (lib_id "Device:R") (at 44.45 83.82 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f415fcc5-b838-45dd-a2f0-dcbcd0f99d15)
+    (property "Reference" "R41" (id 0) (at 44.45 79.1042 90))
+    (property "Value" "1k" (id 1) (at 44.45 81.6411 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 44.45 85.598 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 44.45 83.82 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 44.45 83.82 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 387addbc-3e6e-4336-bceb-3a982f293fa9))
+    (pin "2" (uuid 415453f3-8406-48f2-bd1b-58bbf74dcb7a))
+  )
+
+  (symbol (lib_id "Device:R") (at 177.8 53.34 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f52438d6-9c7e-4343-918b-d279ca2d4396)
+    (property "Reference" "R46" (id 0) (at 179.578 52.5053 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "1k" (id 1) (at 179.578 55.0422 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 179.578 53.34 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 177.8 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" "C328340" (id 4) (at 177.8 53.34 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5605b207-4993-44a1-8e94-ba0829827615))
+    (pin "2" (uuid ae441ac5-b6ad-49a8-821c-145a5250d0ff))
+  )
 )
diff --git a/PCB/FloatPUMP/usb_conn.kicad_sch b/PCB/FloatPUMP/usb_conn.kicad_sch
index 5becf80..f7d5ba3 100644
--- a/PCB/FloatPUMP/usb_conn.kicad_sch
+++ b/PCB/FloatPUMP/usb_conn.kicad_sch
@@ -638,6 +638,11 @@
     (uuid fbb5c586-a116-43c5-b305-67e9b0c87474)
   )
 
+  (text "Alternate Mini-USB Footprint" (at 22.225 97.79 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 2d840251-62b3-491b-b792-9c4f55a582e3)
+  )
+
   (label "U_D-" (at 64.77 118.745 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 152560f8-19f7-48ec-b5f1-95b1dc524aad)
@@ -666,10 +671,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7ba6cfe0-cda9-4252-8e4b-80f09645fa39)
   )
-  (label "Alternate Mini USB-Footprint" (at 29.21 101.6 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 8499314c-4d4e-4b43-8077-850ae1bbb082)
-  )
   (label "CC" (at 71.12 49.53 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 9a60bec1-95fc-4e1f-995f-24fcb3956190)
@@ -755,12 +756,15 @@
     (property "Value" "82k" (id 1) (at 104.648 60.1222 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 101.092 58.42 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 101.092 58.42 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 102.87 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C103831" (id 4) (at 102.87 58.42 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid c86a0387-2ca3-4aec-8c69-7dd9745c1dc7))
     (pin "2" (uuid 8619ae11-0f88-4582-bd6f-7c38871c9b00))
   )
@@ -774,12 +778,15 @@
     (property "Value" "5.1k" (id 1) (at 146.558 52.5022 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 143.002 50.8 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 143.002 50.8 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C23186" (id 4) (at 144.78 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 93659fd3-3e9b-42fb-81bd-db5b3ca3dbaa))
     (pin "2" (uuid 129d2cff-b44d-42ec-bd56-95988b92cc9d))
   )
@@ -809,12 +816,15 @@
     (property "Value" "33k" (id 1) (at 104.648 49.9622 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 101.092 48.26 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 101.092 48.26 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 102.87 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" "C138282" (id 4) (at 102.87 48.26 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid edb865e8-05a7-44fb-a410-b28b40193cf3))
     (pin "2" (uuid 63291a6f-f554-478a-83d6-8b59ececaf6b))
   )
@@ -838,7 +848,7 @@
   (symbol (lib_id "Connector:USB_B_Mini") (at 40.64 116.205 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a10c7624-74f2-4d74-b8c2-615a3c9319a6)
-    (property "Reference" "J?" (id 0) (at 40.64 104.8852 0))
+    (property "Reference" "J4" (id 0) (at 40.64 104.8852 0))
     (property "Value" "USB_B_Mini" (id 1) (at 40.64 107.4221 0))
     (property "Footprint" "" (id 2) (at 44.45 117.475 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -859,35 +869,23 @@
     (uuid a1d6275d-77ab-4d17-8a92-62188e251b81)
     (property "Reference" "R52" (id 0) (at 82.55 49.8942 90))
     (property "Value" "22" (id 1) (at 82.55 52.4311 90))
-    (property "Footprint" "" (id 2) (at 82.55 56.388 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 82.55 56.388 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 82.55 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "JLCPCB" " C96423" (id 4) (at 82.55 54.61 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 5b946653-9684-4bd3-b830-7bfde391fce8))
     (pin "2" (uuid c591a975-429e-4e6f-82b4-135f2e315099))
   )
 
-  (symbol (lib_id "Device:R") (at 82.55 62.23 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a60d8ac2-5a22-4fee-baea-c9a4cac736ab)
-    (property "Reference" "R53" (id 0) (at 82.55 57.5142 90))
-    (property "Value" "22" (id 1) (at 82.55 60.0511 90))
-    (property "Footprint" "" (id 2) (at 82.55 64.008 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 82.55 62.23 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 03002bcf-9908-4b41-8516-d2e9d2ef335b))
-    (pin "2" (uuid 16864496-3fc7-4a40-8f85-4b3e29d47270))
-  )
-
   (symbol (lib_id "power:GND") (at 40.64 129.54 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c2453f31-8f9a-4ea8-9496-9cf5b4b88b5a)
-    (property "Reference" "#PWR?" (id 0) (at 40.64 135.89 0)
+    (property "Reference" "#PWR071" (id 0) (at 40.64 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 40.64 133.9834 0))
@@ -899,4 +897,22 @@
     )
     (pin "1" (uuid 02dad4e5-8052-410a-b802-bc16a7c88949))
   )
+
+  (symbol (lib_id "Device:R") (at 82.55 62.23 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid cd49b1ec-7386-4769-849c-8305c27f7744)
+    (property "Reference" "R53" (id 0) (at 82.55 57.5142 90))
+    (property "Value" "22" (id 1) (at 82.55 60.0511 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 82.55 64.008 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 82.55 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "JLCPCB" " C96423" (id 4) (at 82.55 62.23 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bbcead1c-c134-49c9-bd34-ecde1d62e09b))
+    (pin "2" (uuid b4734863-0766-4ab6-88f1-5b90718f3dea))
+  )
 )