diff --git a/CM4.kicad_sch b/CM4.kicad_sch
index 5bfa3ff..be41916 100644
--- a/CM4.kicad_sch
+++ b/CM4.kicad_sch
@@ -2360,10 +2360,10 @@
     )
   )
 
-  (bus_alias "UART" (members "TXD" "RXD" "CTS" "RTS"))
-  (bus_alias "HDMI" (members "D0+" "D0-" "D1+" "D1-" "D2+" "D2-" "CLK+" "CLK-" "CEC" "HPD" "SDA" "SCL"))
-  (bus_alias "SD" (members "D[0..3]" "CMD" "CLK" "PWR" "DET"))
   (bus_alias "PCIe" (members "~RST" "~CLKREQ" "CLK+" "CLK-" "TX+" "TX-" "RX+" "RX-"))
+  (bus_alias "SD" (members "D[0..3]" "CMD" "CLK" "PWR" "DET"))
+  (bus_alias "HDMI" (members "D0+" "D0-" "D1+" "D1-" "D2+" "D2-" "CLK+" "CLK-" "CEC" "HPD" "SDA" "SCL"))
+  (bus_alias "UART" (members "TXD" "RXD" "CTS" "RTS"))
   (junction (at 59.055 173.99) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 121.92 171.45) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 260.35 90.17) (diameter 1.016) (color 0 0 0 0))
@@ -4086,6 +4086,12 @@
     (property "Datasheet" "~" (id 3) (at 133.985 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "Adam Tech" (id 4) (at 133.985 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PartNumber" "PH1-02-UA" (id 5) (at 133.985 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 21da3741-7fe8-468e-8c93-88b1f5a0a615))
     (pin "2" (uuid 6f83ece9-ce86-4864-bb16-d499bb7d7706))
   )
@@ -4106,6 +4112,12 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Config" "DNP" (id 4) (at 139.065 174.625 0))
+    (property "Manufacturer" "Adam Tech" (id 5) (at 133.985 171.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PartNumber" "PH1-02-UA" (id 6) (at 133.985 171.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid b4a1f10c-64f1-4da7-8457-22f2d2d87c1a))
     (pin "2" (uuid 21208cc7-de7c-4084-ad53-10c0e3b6d335))
   )
@@ -4126,6 +4138,12 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Config" "DNP" (id 4) (at 139.065 186.69 0))
+    (property "Manufacturer" "Adam Tech" (id 5) (at 133.985 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PartNumber" "PH1-02-UA" (id 6) (at 133.985 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 9dbe7cc4-3e4c-40c4-be28-b8c7ae64dfa5))
     (pin "2" (uuid 9ce83081-d234-4a50-a1c0-987022fe627f))
   )
diff --git a/Ethernet.kicad_sch b/Ethernet.kicad_sch
index 7d97376..09dd365 100644
--- a/Ethernet.kicad_sch
+++ b/Ethernet.kicad_sch
@@ -2507,8 +2507,8 @@
     )
   )
 
-  (bus_alias "PoE" (members "VC1" "VC2" "VC3" "VC4"))
   (bus_alias "ETH" (members "TD1+" "TD1-" "TD2+" "TD2-" "TD3+" "TD3-" "TD4+" "TD4-" "LED_YELLOW" "LED_GREEN"))
+  (bus_alias "PoE" (members "VC1" "VC2" "VC3" "VC4"))
   (junction (at 153.67 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 177.8 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 179.07 139.7) (diameter 0.9144) (color 0 0 0 0))
diff --git a/LightBlue.kicad_sch b/LightBlue.kicad_sch
index fdc0f03..10c697c 100644
--- a/LightBlue.kicad_sch
+++ b/LightBlue.kicad_sch
@@ -1521,6 +1521,9 @@
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/2e90de09-d90e-4ad9-880b-e07a7b196371"
       (reference "#PWR0254") (unit 1) (value "GND") (footprint "")
     )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/527d488d-9a3e-4424-ad74-d9bc813ef4ff"
+      (reference "#PWR0263") (unit 1) (value "GND") (footprint "")
+    )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/d1787c6b-531e-41bc-9599-156821dc48f1"
       (reference "#PWR0280") (unit 1) (value "GND") (footprint "")
     )
@@ -1533,9 +1536,6 @@
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/ee91bb64-6fc6-49ab-b3e2-7ceff3756d55"
       (reference "#PWR0283") (unit 1) (value "GND") (footprint "")
     )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/527d488d-9a3e-4424-ad74-d9bc813ef4ff"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f89f09d6-f1f0-49a9-83e6-e577bee7bcdc"
       (reference "C36") (unit 1) (value "10u/35V") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -1621,7 +1621,7 @@
       (reference "C?") (unit 1) (value "33u/35V") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/7a0a3281-9283-4334-8fe5-d2ef547e813a"
-      (reference "D7") (unit 1) (value "B340LB-13-F") (footprint "Diode_SMD:D_SMC")
+      (reference "D7") (unit 1) (value "B340LB-13-F") (footprint "Diode_SMD:D_SMB")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/8ace36c9-6a8b-45b9-8e42-34abb95c09d2"
       (reference "D?") (unit 1) (value "MMBZ5242BLT3G") (footprint "Diode_SMD:D_SOT-23_ANK")
@@ -1947,48 +1947,48 @@
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/a296a227-b646-465d-9753-2ed83a0495ad"
       (reference "#PWR0262") (unit 1) (value "GND1") (footprint "")
     )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/df0d12b5-98ae-4a07-ac5d-75949db06350"
+      (reference "#PWR0264") (unit 1) (value "GND1") (footprint "")
+    )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/dc6327ed-3b2f-4288-948a-32017c9d3a34"
       (reference "#PWR0265") (unit 1) (value "GND1") (footprint "")
     )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/84fb3e31-15ed-4cd2-b95d-bfa988a54819"
       (reference "#PWR0266") (unit 1) (value "GND1") (footprint "")
     )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/a4838144-6bc8-4df6-9e27-b71642105e7c"
+      (reference "#PWR0267") (unit 1) (value "GND1") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/07a76a2c-9d0e-4754-a966-02266405d279"
+      (reference "#PWR0268") (unit 1) (value "GND1") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/1c9f4eb1-6845-4f59-88d1-62dd9d9f7e4b"
+      (reference "#PWR0269") (unit 1) (value "GND1") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/f68c1887-5335-492b-a065-93c43023ed78"
+      (reference "#PWR0270") (unit 1) (value "GND1") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/dce80976-51b4-4a4d-9a5f-1756a27f3243"
+      (reference "#PWR0271") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/dea00b6c-85a7-47d8-9ae7-f7ee17321834"
+      (reference "#PWR0272") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/493377bc-55b2-450d-bd17-d39c9aeccd80"
+      (reference "#PWR0273") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/2f411d47-b633-430b-a6dc-7b242625fe01"
+      (reference "#PWR0274") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/6888556d-e390-44b5-977e-8a0092745a4b/0fc2b142-b115-41f6-98cf-23379d6c9543"
+      (reference "#PWR0275") (unit 1) (value "GND") (footprint "")
+    )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/03f74012-aa68-4f47-b9f5-cabfe69fb508"
       (reference "#PWR0276") (unit 1) (value "GND") (footprint "")
     )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/521d068b-6d03-40af-a44c-0ff5bd5c4213"
       (reference "#PWR0277") (unit 1) (value "+12V") (footprint "")
     )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/07a76a2c-9d0e-4754-a966-02266405d279"
-      (reference "#PWR?") (unit 1) (value "GND1") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/0fc2b142-b115-41f6-98cf-23379d6c9543"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/1c9f4eb1-6845-4f59-88d1-62dd9d9f7e4b"
-      (reference "#PWR?") (unit 1) (value "GND1") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/2f411d47-b633-430b-a6dc-7b242625fe01"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/493377bc-55b2-450d-bd17-d39c9aeccd80"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/a4838144-6bc8-4df6-9e27-b71642105e7c"
-      (reference "#PWR?") (unit 1) (value "GND1") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/dce80976-51b4-4a4d-9a5f-1756a27f3243"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/dea00b6c-85a7-47d8-9ae7-f7ee17321834"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/df0d12b5-98ae-4a07-ac5d-75949db06350"
-      (reference "#PWR?") (unit 1) (value "GND1") (footprint "")
-    )
-    (path "/6888556d-e390-44b5-977e-8a0092745a4b/f68c1887-5335-492b-a065-93c43023ed78"
-      (reference "#PWR?") (unit 1) (value "GND1") (footprint "")
-    )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/6081a57f-3235-4797-b3b9-4f19250faa05"
       (reference "C70") (unit 1) (value "2n2/100V") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -2119,7 +2119,7 @@
       (reference "L3") (unit 1) (value "3u3") (footprint "Inductor_SMD:L_Bourns_SRN6045TA")
     )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/8e4bf553-ed00-4225-96a1-870ada5deeea"
-      (reference "Q2") (unit 1) (value "FDMS86255") (footprint "Package_TO_SOT_SMD:TDSON-8-1")
+      (reference "Q2") (unit 1) (value "BSZ440N10NS3GATMA1") (footprint "Package_TO_SOT_SMD:TDSON-8-1")
     )
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/be922a5b-f2f7-4495-82e8-981b93faffcb"
       (reference "R37") (unit 1) (value "31R6/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
diff --git a/PoE.kicad_sch b/PoE.kicad_sch
index fab7ab0..a4f4939 100644
--- a/PoE.kicad_sch
+++ b/PoE.kicad_sch
@@ -901,26 +901,29 @@
         )
       )
     )
-    (symbol "Transistor_FET:FDMS86255" (pin_names hide) (in_bom yes) (on_board yes)
+    (symbol "Transistor_FET:BSC440N10NS3G" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "FDMS86255" (id 1) (at 5.08 0 0)
+      (property "Value" "BSC440N10NS3G" (id 1) (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "Package_TO_SOT_SMD:TDSON-8-1" (id 2) (at 5.08 -1.905 0)
         (effects (font (size 1.27 1.27) italic) (justify left) hide)
       )
-      (property "Datasheet" "https://www.onsemi.com/pub/Collateral/FDMS86255-D.pdf" (id 3) (at 0 0 90)
+      (property "Datasheet" "http://www.infineon.com/dgdl/Infineon-BSC440N10NS3-DS-v02_04-en.pdf?fileId=db3a30432239cccd0122604520d47f56" (id 3) (at 0 0 90)
         (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "ki_keywords" "shielded-gate-powertrench-MOSFET MOSFET fairchild" (id 4) (at 0 0 0)
+      (property "ki_keywords" "OptiMOS Power MOSFET N-MOS" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "10A Id, 150V Vds, N-Channel Shielded Gate PowerTrench MOSFET, 12.4mOhm Ron, 63nC Qgmax, -55 to 150 °C, 5x6mm SON8" (id 5) (at 0 0 0)
+      (property "ki_description" "18A Id, 100V Vds, OptiMOS N-Channel Power MOSFET, 44.0mOhm Ron, Qg (typ) 8.1nC, PG-TDSON-8" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "FDMS86255_0_1"
+      (property "ki_fp_filters" "TDSON*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "BSC440N10NS3G_0_1"
         (circle (center 1.651 0) (radius 2.794) (stroke (width 0.254)) (fill (type none)))
         (circle (center 2.54 -1.778) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (circle (center 2.54 1.778) (radius 0.254) (stroke (width 0)) (fill (type outline)))
@@ -1011,7 +1014,7 @@
           (stroke (width 0)) (fill (type outline))
         )
       )
-      (symbol "FDMS86255_1_1"
+      (symbol "BSC440N10NS3G_1_1"
         (pin passive line (at 2.54 -5.08 90) (length 2.54)
           (name "S" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
@@ -2905,7 +2908,7 @@
   (symbol (lib_id "power:GND1") (at 67.945 174.625 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a4838144-6bc8-4df6-9e27-b71642105e7c)
-    (property "Reference" "#PWR?" (id 0) (at 67.945 180.975 0)
+    (property "Reference" "#PWR0267" (id 0) (at 67.945 180.975 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND1" (id 1) (at 68.0593 178.9494 0))
@@ -2953,7 +2956,7 @@
   (symbol (lib_id "power:GND1") (at 121.92 129.54 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f68c1887-5335-492b-a065-93c43023ed78)
-    (property "Reference" "#PWR?" (id 0) (at 128.27 129.54 0)
+    (property "Reference" "#PWR0270" (id 0) (at 128.27 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND1" (id 1) (at 125.0951 129.4257 90)
@@ -3037,7 +3040,7 @@
   (symbol (lib_id "power:GND1") (at 158.75 189.865 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid df0d12b5-98ae-4a07-ac5d-75949db06350)
-    (property "Reference" "#PWR?" (id 0) (at 158.75 196.215 0)
+    (property "Reference" "#PWR0264" (id 0) (at 158.75 196.215 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND1" (id 1) (at 158.8643 194.1894 0))
@@ -3053,7 +3056,7 @@
   (symbol (lib_id "power:GND1") (at 165.1 64.77 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1c9f4eb1-6845-4f59-88d1-62dd9d9f7e4b)
-    (property "Reference" "#PWR?" (id 0) (at 165.1 71.12 0)
+    (property "Reference" "#PWR0269" (id 0) (at 165.1 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND1" (id 1) (at 165.2143 69.0944 0))
@@ -3085,7 +3088,7 @@
   (symbol (lib_id "power:GND1") (at 189.23 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 07a76a2c-9d0e-4754-a966-02266405d279)
-    (property "Reference" "#PWR?" (id 0) (at 189.23 30.48 0)
+    (property "Reference" "#PWR0268" (id 0) (at 189.23 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND1" (id 1) (at 189.3443 28.4544 0))
@@ -3117,7 +3120,7 @@
   (symbol (lib_id "power:GND") (at 205.74 25.4 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid dea00b6c-85a7-47d8-9ae7-f7ee17321834)
-    (property "Reference" "#PWR?" (id 0) (at 205.74 31.75 0)
+    (property "Reference" "#PWR0272" (id 0) (at 205.74 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 207.7593 29.2101 0)
@@ -3153,7 +3156,7 @@
   (symbol (lib_id "power:GND") (at 212.09 53.975 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid dce80976-51b4-4a4d-9a5f-1756a27f3243)
-    (property "Reference" "#PWR?" (id 0) (at 212.09 60.325 0)
+    (property "Reference" "#PWR0271" (id 0) (at 212.09 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 214.1093 57.7851 0)
@@ -3171,7 +3174,7 @@
   (symbol (lib_id "power:GND") (at 240.03 45.72 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2f411d47-b633-430b-a6dc-7b242625fe01)
-    (property "Reference" "#PWR?" (id 0) (at 240.03 52.07 0)
+    (property "Reference" "#PWR0274" (id 0) (at 240.03 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 242.0493 49.5301 0)
@@ -3189,7 +3192,7 @@
   (symbol (lib_id "power:GND") (at 247.015 45.72 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0fc2b142-b115-41f6-98cf-23379d6c9543)
-    (property "Reference" "#PWR?" (id 0) (at 247.015 52.07 0)
+    (property "Reference" "#PWR0275" (id 0) (at 247.015 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 249.0343 49.5301 0)
@@ -3225,7 +3228,7 @@
   (symbol (lib_id "power:GND") (at 273.05 45.72 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 493377bc-55b2-450d-bd17-d39c9aeccd80)
-    (property "Reference" "#PWR?" (id 0) (at 273.05 52.07 0)
+    (property "Reference" "#PWR0273" (id 0) (at 273.05 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 275.0693 49.5301 0)
@@ -4536,7 +4539,7 @@
     (property "Manufacturer" "Diodes Incorporated" (id 5) (at 92.71 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PartNumber" "B3100-13-F" (id 6) (at 92.71 173.99 0)
+    (property "PartNumber" "B2100-13-F" (id 6) (at 92.71 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c07a5047-3c60-483c-86d1-b07e92b4e356))
@@ -4631,26 +4634,26 @@
     (pin "2" (uuid be603ad4-9017-42ea-9fb4-97dbeb91b1df))
   )
 
-  (symbol (lib_id "Transistor_FET:FDMS86255") (at 180.34 109.22 0) (unit 1)
+  (symbol (lib_id "Transistor_FET:BSC440N10NS3G") (at 180.34 109.22 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8e4bf553-ed00-4225-96a1-870ada5deeea)
-    (property "Reference" "Q2" (id 0) (at 176.6571 105.5306 0)
+    (property "Reference" "Q2" (id 0) (at 176.6571 102.9906 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "FDMS86255" (id 1) (at 171.5771 104.0193 0)
+    (property "Value" "BSZ440N10NS3GATMA1" (id 1) (at 160.1471 100.8443 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Package_TO_SOT_SMD:TDSON-8-1" (id 2) (at 185.42 111.125 0)
       (effects (font (size 1.27 1.27) italic) (justify left) hide)
     )
-    (property "Datasheet" "https://www.onsemi.com/pub/Collateral/FDMS86255-D.pdf" (id 3) (at 180.34 109.22 90)
+    (property "Datasheet" "http://www.infineon.com/dgdl/Infineon-BSC440N10NS3-DS-v02_04-en.pdf?fileId=db3a30432239cccd0122604520d47f56" (id 3) (at 180.34 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Config" "+PoE" (id 4) (at 177.8 101.6 0))
-    (property "Manufacturer" "ON Semiconductor" (id 5) (at 180.34 109.22 0)
+    (property "Config" "+PoE" (id 4) (at 177.8 105.41 0))
+    (property "Manufacturer" "Infineon Technologies" (id 5) (at 180.34 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PartNumber" "FDMS86255" (id 6) (at 180.34 109.22 0)
+    (property "PartNumber" "BSZ440N10NS3GATMA1" (id 6) (at 180.34 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d2ada149-d832-4b2b-909c-b1b14f29b2ce))
diff --git a/Power.kicad_sch b/Power.kicad_sch
index a5ffc5f..193612f 100644
--- a/Power.kicad_sch
+++ b/Power.kicad_sch
@@ -1787,7 +1787,7 @@
   (symbol (lib_id "power:GND") (at 86.36 56.515 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 527d488d-9a3e-4424-ad74-d9bc813ef4ff)
-    (property "Reference" "#PWR?" (id 0) (at 86.36 62.865 0)
+    (property "Reference" "#PWR0263" (id 0) (at 86.36 62.865 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 86.487 60.9092 0))
@@ -2589,7 +2589,7 @@
     (uuid 7a0a3281-9283-4334-8fe5-d2ef547e813a)
     (property "Reference" "D7" (id 0) (at 78.74 19.285 0))
     (property "Value" "B340LB-13-F" (id 1) (at 78.74 21.5835 0))
-    (property "Footprint" "Diode_SMD:D_SMC" (id 2) (at 78.74 26.035 0)
+    (property "Footprint" "Diode_SMD:D_SMB" (id 2) (at 78.74 26.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.diodes.com/assets/Datasheets/ds30240.pdf" (id 3) (at 78.74 26.035 0)
@@ -2664,10 +2664,10 @@
     (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3013SFV.pdf" (id 3) (at 78.74 40.005 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Manufacturer" "Test" (id 4) (at 78.74 40.005 90)
+    (property "Manufacturer" "Diodes Incorporated" (id 4) (at 78.74 40.005 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PartNumber" "Test" (id 5) (at 78.74 40.005 90)
+    (property "PartNumber" "DMP3013SFV-7" (id 5) (at 78.74 40.005 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Config" "-PoE" (id 6) (at 78.74 34.29 90))
diff --git a/USB.kicad_sch b/USB.kicad_sch
index 314f066..abb92f7 100644
--- a/USB.kicad_sch
+++ b/USB.kicad_sch
@@ -1888,9 +1888,9 @@
     )
   )
 
-  (bus_alias "CM4_USB" (members "CM4_USB_D+" "CM4_USB_D-" "CM4_USB_OTG_ID"))
-  (bus_alias "USB" (members "D+" "D-"))
   (bus_alias "I2C" (members "SDA" "SCL"))
+  (bus_alias "USB" (members "D+" "D-"))
+  (bus_alias "CM4_USB" (members "CM4_USB_D+" "CM4_USB_D-" "CM4_USB_OTG_ID"))
   (junction (at 22.86 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 22.86 88.9) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 24.765 187.325) (diameter 0.9144) (color 0 0 0 0))
@@ -4758,6 +4758,12 @@
     (property "Datasheet" "~" (id 3) (at 76.2 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "Adam Tech" (id 4) (at 76.2 187.325 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PartNumber" "PH1-03-UA" (id 5) (at 76.2 187.325 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 55d2c10c-a503-4744-8c7e-1cf7df2450b5))
     (pin "2" (uuid b155fff0-0d38-4f9f-b6df-f106511ebaa7))
     (pin "3" (uuid d6f29439-076b-4e2a-9b5f-65886b971683))