diff --git a/fpga.kicad_sch b/fpga.kicad_sch
index 032f500..d3e458b 100644
--- a/fpga.kicad_sch
+++ b/fpga.kicad_sch
@@ -3043,7 +3043,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1298f126-2352-48f2-825f-de17742fc4db)
   )
-  (bus_entry (at 139.7 198.12) (size 2.54 -2.54)
+  (bus_entry (at 137.16 198.12) (size 2.54 -2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23b51995-fe23-4d97-a066-5f4147818f87)
   )
@@ -3055,7 +3055,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 75a9480d-8ac3-41df-9f4f-5d9ed7a1782e)
   )
-  (bus_entry (at 139.7 195.58) (size 2.54 -2.54)
+  (bus_entry (at 137.16 195.58) (size 2.54 -2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 785dddf9-3cf0-4e85-8632-1a314bbc34b2)
   )
@@ -3067,15 +3067,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ae509cef-b2d4-4701-bd39-f4d022ead86d)
   )
-  (bus_entry (at 139.7 190.5) (size 2.54 -2.54)
+  (bus_entry (at 137.16 190.5) (size 2.54 -2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc888799-c0b4-4c79-87f8-a4a62f5d81d0)
   )
-  (bus_entry (at 139.7 193.04) (size 2.54 -2.54)
+  (bus_entry (at 137.16 193.04) (size 2.54 -2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc888799-c0b4-4c79-87f8-a4a62f5d81d1)
   )
-  (bus_entry (at 142.24 185.42) (size -2.54 2.54)
+  (bus_entry (at 139.7 185.42) (size -2.54 2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc888799-c0b4-4c79-87f8-a4a62f5d81d2)
   )
@@ -3453,7 +3453,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30c64bd1-d89e-42a7-b959-422182fb6ca2)
   )
-  (wire (pts (xy 142.24 195.58) (xy 154.94 195.58))
+  (wire (pts (xy 139.7 195.58) (xy 154.94 195.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3138000d-5110-4977-8c17-49d59c01bc07)
   )
@@ -3642,7 +3642,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 49198dc0-34f1-47fb-b4db-cb502173042b)
   )
-  (bus (pts (xy 139.7 195.58) (xy 139.7 198.12))
+  (bus (pts (xy 137.16 195.58) (xy 137.16 198.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 492cd1a9-4a0d-4e59-a2be-bb74511cf978)
   )
@@ -3692,7 +3692,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 504757c9-6028-449b-8dd0-30e975475027)
   )
-  (wire (pts (xy 142.24 190.5) (xy 149.86 190.5))
+  (wire (pts (xy 139.7 190.5) (xy 149.86 190.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 506d69f6-45c3-440c-8450-7d80b2b6fc1c)
   )
@@ -3808,7 +3808,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5e7f4ce2-d2f5-4380-8e7b-5660fdfe4130)
   )
-  (wire (pts (xy 142.24 187.96) (xy 157.48 187.96))
+  (wire (pts (xy 139.7 187.96) (xy 157.48 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5ef519c5-bcbd-4175-9cab-1c75bf5a49fa)
   )
@@ -4173,7 +4173,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 996c56e0-e3ec-4658-8213-e469ca806842)
   )
-  (wire (pts (xy 142.24 193.04) (xy 152.4 193.04))
+  (wire (pts (xy 139.7 193.04) (xy 152.4 193.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 99ae60fe-660e-41a7-bbda-7519d7b06567)
   )
@@ -4181,11 +4181,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9aa1601d-a7ac-466b-9369-3b246eead236)
   )
-  (bus (pts (xy 139.7 198.12) (xy 139.7 224.79))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9c0981f0-f778-42f5-8ccc-e4bd288f8a3b)
-  )
-
   (wire (pts (xy 43.18 66.04) (xy 39.37 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9cae7b59-1e6f-4c09-b6a1-7fec65be2cdf)
@@ -4315,7 +4310,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aaedf940-e14f-412f-9b26-5fe81eaf31fa)
   )
-  (bus (pts (xy 139.7 224.79) (xy 191.77 224.79))
+  (bus (pts (xy 137.16 224.79) (xy 191.77 224.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab4c2aaa-57fd-49ae-bd7f-ac66a54136f9)
   )
@@ -4336,7 +4331,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ad50243b-1435-4b77-b8f6-cffec917f605)
   )
-  (bus (pts (xy 139.7 190.5) (xy 139.7 193.04))
+  (bus (pts (xy 137.16 190.5) (xy 137.16 193.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ad8169ce-5295-4b25-8c67-dc1316861c21)
   )
@@ -4353,7 +4348,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b1a33d0d-29f2-43c9-b8a4-201a3bc42808)
   )
-  (wire (pts (xy 142.24 185.42) (xy 160.02 185.42))
+  (wire (pts (xy 139.7 185.42) (xy 160.02 185.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b1a906ed-d994-497e-95c5-bce919c8badf)
   )
@@ -4405,6 +4400,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid baa1f67b-8692-4cd5-9861-ff17ab600b75)
   )
+  (bus (pts (xy 137.16 198.12) (xy 137.16 224.79))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bab52631-98f3-4ca2-b9c2-c9045b95598e)
+  )
+
   (wire (pts (xy 31.75 63.5) (xy 31.75 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bb70d908-e955-4737-a8ef-0b71c83362c4)
@@ -4417,7 +4417,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bc7ccac9-6e56-4a2c-bf25-4c95c1121299)
   )
-  (bus (pts (xy 139.7 193.04) (xy 139.7 195.58))
+  (bus (pts (xy 137.16 193.04) (xy 137.16 195.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bc819fa0-a51f-41c7-9b57-465752134af2)
   )
@@ -4430,11 +4430,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bdd47616-8c85-4a53-a341-dfa9115b167a)
   )
-  (bus (pts (xy 139.7 187.96) (xy 139.7 190.5))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bde80e74-de9b-4d53-88b1-6e4e1c5fef6f)
-  )
-
   (wire (pts (xy 45.72 209.55) (xy 38.1 209.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bdfa075e-9162-429a-aee8-89b23184e622)
@@ -4468,6 +4463,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c36a760f-c84f-4885-a9c7-50d7c7b36572)
   )
+  (bus (pts (xy 137.16 187.96) (xy 137.16 190.5))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c39d5b84-8fca-494b-a8bc-d2fd5c45f2a1)
+  )
+
   (wire (pts (xy 43.18 176.53) (xy 45.72 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c460c725-b6ce-4e1c-99a7-006f0a3dde9e)
@@ -4966,11 +4966,11 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 44dce111-a7fa-4c56-a8ab-6d3d01d7d8bc)
   )
-  (label "CFG_CLK" (at 149.86 187.96 180)
+  (label "CFG_CLK" (at 148.59 187.96 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 520b1415-9245-4b93-ba6b-5bd118f3c7bc)
   )
-  (label "CFG_IO3" (at 149.86 195.58 180)
+  (label "CFG_IO3" (at 148.59 195.58 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5f9c17fb-517a-4a26-b1c7-9cc06f8af2b4)
   )
@@ -5002,11 +5002,11 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid bab9f37e-b9aa-434d-ae21-8877a4b4669c)
   )
-  (label "~{CFG_CS}" (at 149.86 190.5 180)
+  (label "~{CFG_CS}" (at 148.59 190.5 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid cb122e25-34a1-46df-8607-a2d613de228d)
   )
-  (label "CFG_IO2" (at 149.86 193.04 180)
+  (label "CFG_IO2" (at 148.59 193.04 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f1a4cfd4-09cc-4c7f-8893-4f404a317073)
   )
@@ -5014,7 +5014,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f737a4d0-52fe-420f-9d85-5f45f40feacf)
   )
-  (label "CFG_IO0" (at 149.86 185.42 180)
+  (label "CFG_IO0" (at 148.59 185.42 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid fa3cab35-4a7b-468e-8444-535770e3eecf)
   )
@@ -5281,7 +5281,7 @@
     (property "Reference" "Q601" (id 0) (at 238.76 194.3099 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Q_NMOS_GSD" (id 1) (at 238.76 196.8499 0)
+    (property "Value" "" (id 1) (at 238.76 196.8499 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 237.49 193.04 0)
@@ -5290,10 +5290,10 @@
     (property "Datasheet" "~" (id 3) (at 232.41 195.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PartNumber" "BSS138PW,115" (id 4) (at 232.41 195.58 0)
+    (property "PartNumber" "DMN63D1LT-13" (id 4) (at 232.41 195.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Mnf." "Nexperia" (id 5) (at 232.41 195.58 0)
+    (property "Mnf." "Diodes Incorporated" (id 5) (at 232.41 195.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ab6b7b36-e380-41e6-83c0-048f5c48e8ac))
@@ -9389,10 +9389,10 @@
     (property "Reference" "TP607" (id 0) (at 85.09 234.95 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "OSC_OE" (id 1) (at 82.55 234.95 90)
+    (property "Value" "" (id 1) (at 82.55 234.95 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "lsf-kicad-lib:TestPoint_D0.8mm_Mask-Only" (id 2) (at 78.74 229.87 0)
+    (property "Footprint" "" (id 2) (at 78.74 229.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 78.74 229.87 0)
diff --git a/power.kicad_sch b/power.kicad_sch
index 26f5b7b..8f18f52 100644
--- a/power.kicad_sch
+++ b/power.kicad_sch
@@ -833,6 +833,7 @@
     )
   )
 
+
   (junction (at 102.87 118.11) (diameter 0) (color 0 0 0 0)
     (uuid 1e6eef92-27eb-403d-9372-916ea23531cd)
   )
@@ -1990,8 +1991,8 @@
     (in_bom yes) (on_board yes)
     (uuid 88999d67-3358-4d26-82e3-9679940ba0c5)
     (property "Reference" "U302" (id 0) (at 99.06 110.49 0))
-    (property "Value" "74AUP1G32" (id 1) (at 101.6 113.03 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-353_SC-70-5" (id 2) (at 93.98 118.11 0)
+    (property "Value" "" (id 1) (at 101.6 113.03 0))
+    (property "Footprint" "" (id 2) (at 93.98 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://eu.mouser.com/datasheet/2/916/74AUP1G32_Q100-1597633.pdf" (id 3) (at 93.98 118.11 0)
diff --git a/sidloc.kicad_sch b/sidloc.kicad_sch
index 4a7ce3d..bf89db7 100644
--- a/sidloc.kicad_sch
+++ b/sidloc.kicad_sch
@@ -341,8 +341,11 @@
     (uuid e3e9a696-46cb-46c0-bc5a-f554f3ed4f59)
   )
 
+  (no_connect (at 78.74 63.5) (uuid d8fecec7-ca82-40dd-a8ce-622e33bf1e98))
+  (no_connect (at 78.74 71.12) (uuid d8fecec7-ca82-40dd-a8ce-622e33bf1e98))
+  (no_connect (at 78.74 66.04) (uuid d8fecec7-ca82-40dd-a8ce-622e33bf1e98))
+  (no_connect (at 78.74 68.58) (uuid d8fecec7-ca82-40dd-a8ce-622e33bf1e98))
   (no_connect (at 78.74 45.72) (uuid df5db653-9825-433b-9b88-ecfdf07d8b71))
-  (no_connect (at 78.74 48.26) (uuid df5db653-9825-433b-9b88-ecfdf07d8b72))
   (no_connect (at 78.74 43.18) (uuid df5db653-9825-433b-9b88-ecfdf07d8b73))
   (no_connect (at 224.79 52.07) (uuid e1179d21-9da6-4391-a055-a686ece6c747))
   (no_connect (at 224.79 49.53) (uuid e1179d21-9da6-4391-a055-a686ece6c748))
@@ -1002,7 +1005,7 @@
     )
   )
 
-  (sheet (at 78.74 40.64) (size 33.02 24.13)
+  (sheet (at 78.74 40.64) (size 33.02 33.02)
     (stroke (width 0.1524) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
     (uuid 95661826-cedc-4d00-8ee8-8834174483ba)
@@ -1012,10 +1015,6 @@
     (property "Sheet file" "power.kicad_sch" (id 1) (at 78.74 35.56 0)
       (effects (font (size 1.27 1.27)) (justify left top))
     )
-    (pin "3V3_EN" input (at 111.76 49.53 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid 6f8e1f45-5853-4e61-b1cb-3e49cd390418)
-    )
     (pin "TBat" input (at 78.74 57.15 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 55c7b6b2-fbbe-405a-83ad-82b17380808f)
@@ -1052,18 +1051,34 @@
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid ed2a983b-3d2b-49ab-8ea5-f6240df89836)
     )
-    (pin "CHG_TTE" input (at 78.74 48.26 180)
-      (effects (font (size 1.27 1.27)) (justify left))
-      (uuid c5442b41-ccb7-4e9f-a339-6a66ef9c75ee)
-    )
-    (pin "CHG_EN" input (at 111.76 59.69 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-      (uuid d2bac4d7-c36d-4627-8330-b8056eabf52b)
-    )
     (pin "VIN" input (at 78.74 59.69 180)
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid 89e8860b-8c6d-4ca3-b75d-d074f3b52a1b)
     )
+    (pin "~{CHG_EN}" input (at 111.76 59.69 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+      (uuid 4509f394-c5bb-42b0-84cf-e65307a823b1)
+    )
+    (pin "~{CHG_TTE}" input (at 111.76 49.53 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+      (uuid fe12c7f5-0a45-44d3-89d5-d2abf71eacf4)
+    )
+    (pin "RBF_PIN2" input (at 78.74 71.12 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 5017db5e-7eab-40ea-a334-e432f879809e)
+    )
+    (pin "KILL_NO_2" input (at 78.74 66.04 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 3859c1ba-34c4-496d-a7a9-4c8b91f8850a)
+    )
+    (pin "RBF_PIN1" input (at 78.74 68.58 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 77222f00-3bf6-499b-8d15-e959b1d30085)
+    )
+    (pin "KILL_NO_1" input (at 78.74 63.5 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 6bfedf5e-6a59-49cf-a309-89705feba347)
+    )
   )
 
   (sheet (at 185.42 40.64) (size 39.37 34.29)