diff --git a/hardware/conn-mchip.sch b/hardware/conn-mchip.sch
index b177cc7..82a3c03 100644
--- a/hardware/conn-mchip.sch
+++ b/hardware/conn-mchip.sch
@@ -119,7 +119,7 @@ Wire Wire Line
 Wire Wire Line
 	3800 3600 3800 3000
 Wire Wire Line
-	3800 3000 2900 3000
+	3800 3000 3300 3000
 Wire Wire Line
 	4000 3800 4000 3500
 Wire Wire Line
@@ -147,7 +147,7 @@ Wire Wire Line
 	3900 3000 3800 3000
 Connection ~ 3800 3000
 Wire Wire Line
-	4200 3000 5000 3000
+	4200 3000 4600 3000
 $Comp
 L Device:R R?
 U 1 1 6005D77E
@@ -164,8 +164,6 @@ $EndComp
 Wire Wire Line
 	5000 3100 5000 3000
 Connection ~ 5000 3000
-Wire Wire Line
-	5000 3000 5200 3000
 Wire Wire Line
 	5000 3400 5000 4950
 Wire Wire Line
@@ -382,4 +380,34 @@ Wire Wire Line
 Connection ~ 4200 4950
 Wire Wire Line
 	4200 4950 2300 4950
+Wire Wire Line
+	5000 3000 5200 3000
+$Comp
+L power:PWR_FLAG #FLG0102
+U 1 1 5F59B582
+P 3300 3000
+F 0 "#FLG0102" H 3300 3075 50  0001 C CNN
+F 1 "PWR_FLAG" H 3300 3173 50  0000 C CNN
+F 2 "" H 3300 3000 50  0001 C CNN
+F 3 "~" H 3300 3000 50  0001 C CNN
+	1    3300 3000
+	1    0    0    -1  
+$EndComp
+Connection ~ 3300 3000
+Wire Wire Line
+	3300 3000 2900 3000
+$Comp
+L power:PWR_FLAG #FLG0103
+U 1 1 5F5A5252
+P 4600 3000
+F 0 "#FLG0103" H 4600 3075 50  0001 C CNN
+F 1 "PWR_FLAG" H 4600 3173 50  0000 C CNN
+F 2 "" H 4600 3000 50  0001 C CNN
+F 3 "~" H 4600 3000 50  0001 C CNN
+	1    4600 3000
+	1    0    0    -1  
+$EndComp
+Connection ~ 4600 3000
+Wire Wire Line
+	4600 3000 5000 3000
 $EndSCHEMATC
diff --git a/hardware/conn-stmicro.sch b/hardware/conn-stmicro.sch
index 5d20cc6..a6b7629 100644
--- a/hardware/conn-stmicro.sch
+++ b/hardware/conn-stmicro.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 8
+Sheet 6 8
 Title "Democratic Sendcomm"
 Date "2020-09-08"
 Rev "0.8.0"
diff --git a/hardware/ctrl-mchip.sch b/hardware/ctrl-mchip.sch
index 416b757..94bbaf0 100644
--- a/hardware/ctrl-mchip.sch
+++ b/hardware/ctrl-mchip.sch
@@ -38,34 +38,34 @@ POWAMP
 $Comp
 L Device:C C37
 U 1 1 5F60A467
-P 950 3550
-F 0 "C37" H 1065 3596 50  0000 L CNN
-F 1 "10pF" H 1065 3505 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 988 3400 50  0001 C CNN
-F 3 "~" H 950 3550 50  0001 C CNN
-	1    950  3550
-	1    0    0    -1  
+P 1600 3400
+F 0 "C37" V 1800 3150 50  0000 L CNN
+F 1 "10pF" V 1700 3100 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 1638 3250 50  0001 C CNN
+F 3 "~" H 1600 3400 50  0001 C CNN
+	1    1600 3400
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:Crystal Y1
 U 1 1 5F606FD8
-P 1550 3550
-F 0 "Y1" V 1504 3681 50  0000 L CNN
-F 1 "Crystal" V 1595 3681 50  0000 L CNN
-F 2 "Crystal:Crystal_SMD_MicroCrystal_CM9V-T1A-2Pin_1.6x1.0mm" H 1550 3550 50  0001 C CNN
-F 3 "~" H 1550 3550 50  0001 C CNN
-	1    1550 3550
+P 2150 3550
+F 0 "Y1" V 2104 3681 50  0000 L CNN
+F 1 "Crystal" V 2195 3681 50  0000 L CNN
+F 2 "Crystal:Crystal_SMD_MicroCrystal_CM9V-T1A-2Pin_1.6x1.0mm" H 2150 3550 50  0001 C CNN
+F 3 "~" H 2150 3550 50  0001 C CNN
+	1    2150 3550
 	0    1    1    0   
 $EndComp
 $Comp
 L power:GND #PWR030
 U 1 1 5F60C4EA
-P 950 3700
-F 0 "#PWR030" H 950 3450 50  0001 C CNN
-F 1 "GND" H 955 3527 50  0000 C CNN
-F 2 "" H 950 3700 50  0001 C CNN
-F 3 "" H 950 3700 50  0001 C CNN
-	1    950  3700
+P 1250 3700
+F 0 "#PWR030" H 1250 3450 50  0001 C CNN
+F 1 "GND" H 1255 3527 50  0000 C CNN
+F 2 "" H 1250 3700 50  0001 C CNN
+F 3 "" H 1250 3700 50  0001 C CNN
+	1    1250 3700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -127,19 +127,6 @@ F 3 "" H 2550 2800 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	2850 4400 2750 4400
-$Comp
-L power:GND #PWR033
-U 1 1 5F6260B4
-P 4500 6700
-F 0 "#PWR033" H 4500 6450 50  0001 C CNN
-F 1 "GND" H 4505 6527 50  0000 C CNN
-F 2 "" H 4500 6700 50  0001 C CNN
-F 3 "" H 4500 6700 50  0001 C CNN
-	1    4500 6700
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4500 6300 4500 6700
 Wire Wire Line
 	3400 6300 3400 6500
 Wire Wire Line
@@ -180,7 +167,7 @@ Wire Wire Line
 	4400 6300 4400 6500
 Connection ~ 4400 6500
 Wire Wire Line
-	4400 6500 4700 6500
+	4400 6500 4500 6500
 Wire Wire Line
 	4700 6300 4700 6500
 Connection ~ 4700 6500
@@ -360,39 +347,11 @@ $EndComp
 Wire Wire Line
 	5150 2700 5150 2300
 Wire Wire Line
-	5150 2300 5450 2300
-$Comp
-L Device:C C38
-U 1 1 5F609CF5
-P 2150 3550
-F 0 "C38" H 2265 3596 50  0000 L CNN
-F 1 "10pF" H 2265 3505 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2188 3400 50  0001 C CNN
-F 3 "~" H 2150 3550 50  0001 C CNN
-	1    2150 3550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2850 3700 2150 3700
-Connection ~ 950  3700
-Connection ~ 1550 3700
-Wire Wire Line
-	1550 3700 950  3700
-Connection ~ 2150 3700
-Wire Wire Line
-	2150 3700 1550 3700
+	5150 2300 5300 2300
 Wire Wire Line
 	2850 3600 2650 3600
 Wire Wire Line
 	2650 3600 2650 3400
-Wire Wire Line
-	2650 3400 2150 3400
-Connection ~ 1550 3400
-Wire Wire Line
-	1550 3400 950  3400
-Connection ~ 2150 3400
-Wire Wire Line
-	2150 3400 1550 3400
 Wire Wire Line
 	2750 5000 2850 5000
 Wire Wire Line
@@ -713,8 +672,6 @@ F 3 "~" H 8350 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Connection ~ 8350 1400
-Wire Wire Line
-	8350 1400 7950 1400
 $Comp
 L Device:C C24
 U 1 1 5FAFF8F3
@@ -933,7 +890,7 @@ Text Notes 1700 4900 0    50   ~ 0
 USER
 Text Notes 7400 5150 0    50   ~ 0
 32MHz oscillator
-Text Notes 1300 3350 0    50   ~ 0
+Text Notes 2150 3350 0    50   ~ 0
 32kHz crystal
 Wire Wire Line
 	3850 2400 3550 2400
@@ -1047,7 +1004,7 @@ VDDANA
 Text Notes 5750 1350 0    50   ~ 0
 VBAT_ANA
 Wire Wire Line
-	2550 1400 4350 1400
+	2550 1400 3950 1400
 Wire Wire Line
 	4150 2700 4150 1900
 Wire Wire Line
@@ -1079,4 +1036,144 @@ F 3 "https://ww1.microchip.com/downloads/en/DeviceDoc/SAMR34-R35-Low-Power-LoRa-
 	1    4450 4500
 	1    0    0    -1  
 $EndComp
+$Comp
+L power:GND #PWR0101
+U 1 1 5F59158C
+P 9400 4400
+F 0 "#PWR0101" H 9400 4150 50  0001 C CNN
+F 1 "GND" H 9405 4227 50  0000 C CNN
+F 2 "" H 9400 4400 50  0001 C CNN
+F 3 "" H 9400 4400 50  0001 C CNN
+	1    9400 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:PWR_FLAG #FLG0101
+U 1 1 5F591A71
+P 9400 4400
+F 0 "#FLG0101" H 9400 4475 50  0001 C CNN
+F 1 "PWR_FLAG" H 9400 4573 50  0000 C CNN
+F 2 "" H 9400 4400 50  0001 C CNN
+F 3 "~" H 9400 4400 50  0001 C CNN
+	1    9400 4400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7950 1400 8350 1400
+$Comp
+L power:PWR_FLAG #FLG0104
+U 1 1 5F5A6637
+P 7050 5200
+F 0 "#FLG0104" H 7050 5275 50  0001 C CNN
+F 1 "PWR_FLAG" H 7050 5373 50  0000 C CNN
+F 2 "" H 7050 5200 50  0001 C CNN
+F 3 "~" H 7050 5200 50  0001 C CNN
+	1    7050 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7050 5200 7350 5200
+$Comp
+L power:PWR_FLAG #FLG0105
+U 1 1 5F5AF22C
+P 3950 1400
+F 0 "#FLG0105" H 3950 1475 50  0001 C CNN
+F 1 "PWR_FLAG" H 3950 1573 50  0000 C CNN
+F 2 "" H 3950 1400 50  0001 C CNN
+F 3 "~" H 3950 1400 50  0001 C CNN
+	1    3950 1400
+	1    0    0    -1  
+$EndComp
+Connection ~ 3950 1400
+Wire Wire Line
+	3950 1400 4350 1400
+$Comp
+L power:PWR_FLAG #FLG0106
+U 1 1 5F5AF50B
+P 5300 2400
+F 0 "#FLG0106" H 5300 2475 50  0001 C CNN
+F 1 "PWR_FLAG" H 5300 2565 39  0000 C CNN
+F 2 "" H 5300 2400 50  0001 C CNN
+F 3 "~" H 5300 2400 50  0001 C CNN
+	1    5300 2400
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5300 2400 5300 2300
+Connection ~ 5300 2300
+Wire Wire Line
+	5300 2300 5450 2300
+Wire Wire Line
+	4500 6300 4500 6500
+$Comp
+L power:GND #PWR033
+U 1 1 5F6260B4
+P 4500 6700
+F 0 "#PWR033" H 4500 6450 50  0001 C CNN
+F 1 "GND" H 4505 6527 50  0000 C CNN
+F 2 "" H 4500 6700 50  0001 C CNN
+F 3 "" H 4500 6700 50  0001 C CNN
+	1    4500 6700
+	1    0    0    -1  
+$EndComp
+Connection ~ 4500 6500
+Wire Wire Line
+	4500 6500 4700 6500
+Wire Wire Line
+	4500 6500 4500 6700
+Wire Wire Line
+	3550 2100 3150 2100
+Connection ~ 3150 2100
+Wire Wire Line
+	2150 3400 2650 3400
+Wire Wire Line
+	2150 3700 2850 3700
+$Comp
+L Device:C C38
+U 1 1 5F609CF5
+P 1600 3700
+F 0 "C38" V 1500 3450 50  0000 L CNN
+F 1 "10pF" V 1400 3400 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 1638 3550 50  0001 C CNN
+F 3 "~" H 1600 3700 50  0001 C CNN
+	1    1600 3700
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	2150 3400 1750 3400
+Connection ~ 2150 3400
+Wire Wire Line
+	2150 3700 1750 3700
+Connection ~ 2150 3700
+Wire Wire Line
+	1450 3700 1250 3700
+Wire Wire Line
+	1450 3400 1250 3400
+Wire Wire Line
+	1250 3400 1250 3700
+Connection ~ 1250 3700
+$Comp
+L power:PWR_FLAG #FLG0107
+U 1 1 5F64A0B5
+P 3050 2400
+F 0 "#FLG0107" H 3050 2475 50  0001 C CNN
+F 1 "PWR_FLAG" H 2800 2400 50  0000 C CNN
+F 2 "" H 3050 2400 50  0001 C CNN
+F 3 "~" H 3050 2400 50  0001 C CNN
+	1    3050 2400
+	1    0    0    -1  
+$EndComp
+Connection ~ 3050 2400
+$Comp
+L power:PWR_FLAG #FLG0108
+U 1 1 5F64A3C3
+P 3850 2400
+F 0 "#FLG0108" H 3850 2475 50  0001 C CNN
+F 1 "PWR_FLAG" H 3650 2350 50  0000 C CNN
+F 2 "" H 3850 2400 50  0001 C CNN
+F 3 "~" H 3850 2400 50  0001 C CNN
+	1    3850 2400
+	1    0    0    -1  
+$EndComp
+Connection ~ 3850 2400
 $EndSCHEMATC
diff --git a/hardware/ctrl-stmicro.sch b/hardware/ctrl-stmicro.sch
index fbf45b8..f717884 100644
--- a/hardware/ctrl-stmicro.sch
+++ b/hardware/ctrl-stmicro.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 8
+Sheet 2 8
 Title "Democratic Sendcomm"
 Date "2020-09-08"
 Rev "0.8.0"
diff --git a/hardware/dscomm.net b/hardware/dscomm.net
index 78539b2..976e9bd 100644
--- a/hardware/dscomm.net
+++ b/hardware/dscomm.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
-    (source /home/mschloh/Projects/circuit/nlnet-dscomm/hardware/dscomm.sch)
-    (date "Mi 09 Sep 2020 01:57:21 CEST")
+    (source dscomm.sch)
+    (date "Mi 09 Sep 2020 02:37:38 CEST")
     (tool "Eeschema 5.1.5+dfsg1-2build2")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -148,13 +148,6 @@
       (libsource (lib Mechanical) (part Fiducial) (description "Fiducial Marker"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5F4EF4FC))
-    (comp (ref U1)
-      (value STM32WLE5C)
-      (footprint Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm)
-      (datasheet https://www.st.com/resource/datasheet/stm32wle5jc.pdf)
-      (libsource (lib Elabdev) (part STM32WLE5C) (description "LPWAN Arm Cortex-M4 MCUs, LoRa, (G)FSK, (G)MSK, BPSK, 64/128/256KB Flash, 64KB SRAM, 7x7mm UFQFPN-48"))
-      (sheetpath (names /Sheet5F53D686/) (tstamps /5F53D687/))
-      (tstamp 5F549D72))
     (comp (ref U2)
       (value SKY13373)
       (footprint Elabdev:QFN-12-1EP_2x2mm_P0.5mm_EP0.76x0.76mm)
@@ -596,13 +589,6 @@
       (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
       (sheetpath (names /Sheet5F53D5B4/) (tstamps /5F53D5B5/))
       (tstamp 5F715342))
-    (comp (ref C38)
-      (value 10pF)
-      (footprint Capacitor_SMD:C_0805_2012Metric)
-      (datasheet ~)
-      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
-      (sheetpath (names /Sheet5F53D5B4/) (tstamps /5F53D5B5/))
-      (tstamp 5F609CF5))
     (comp (ref C23)
       (value 4,7pF)
       (footprint Capacitor_SMD:C_0805_2012Metric)
@@ -770,7 +756,14 @@
       (datasheet https://ww1.microchip.com/downloads/en/DeviceDoc/SAMR34-R35-Low-Power-LoRa-Sub-GHz-SiP-Data-Sheet-DS70005356B.pdf)
       (libsource (lib Elabdev) (part ATSAMR34) (description "SAM R34/R35 Low Power LoRa Sub-GHz System-in-Package (SiP), Cortex-M0+ core, 256kB Flash, 40 KB RAM, 6x6mm TFBGA-64"))
       (sheetpath (names /Sheet5F53D5B4/) (tstamps /5F53D5B5/))
-      (tstamp 6052EF69)))
+      (tstamp 6052EF69))
+    (comp (ref C38)
+      (value 10pF)
+      (footprint Capacitor_SMD:C_0805_2012Metric)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /Sheet5F53D5B4/) (tstamps /5F53D5B5/))
+      (tstamp 5F609CF5)))
   (libparts
     (libpart (lib Connector) (part Conn_01x03_Male)
       (description "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)")
@@ -1110,66 +1103,6 @@
         (pin (num 10) (name GND) (type power_in))
         (pin (num 11) (name RFC) (type passive))
         (pin (num 12) (name GND) (type power_in))))
-    (libpart (lib Elabdev) (part STM32WLE5C)
-      (description "LPWAN Arm Cortex-M4 MCUs, LoRa, (G)FSK, (G)MSK, BPSK, 64/128/256KB Flash, 64KB SRAM, 7x7mm UFQFPN-48")
-      (docs https://www.st.com/resource/datasheet/stm32wle5jc.pdf)
-      (footprints
-        (fp QFN*7x7mm*P0.5mm*EP5.6x5.6mm*))
-      (fields
-        (field (name Reference) U)
-        (field (name Value) STM32WLE5C)
-        (field (name Footprint) Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm)
-        (field (name Datasheet) https://www.st.com/en/microcontrollers-microprocessors/stm32wle5jc.html))
-      (pins
-        (pin (num 1) (name PB3) (type BiDi))
-        (pin (num 2) (name PB4) (type BiDi))
-        (pin (num 3) (name PB5) (type BiDi))
-        (pin (num 4) (name PB6) (type BiDi))
-        (pin (num 5) (name PB7) (type BiDi))
-        (pin (num 6) (name PB8) (type BiDi))
-        (pin (num 7) (name PA0) (type BiDi))
-        (pin (num 8) (name PA1) (type BiDi))
-        (pin (num 9) (name PA2) (type BiDi))
-        (pin (num 10) (name PA3) (type BiDi))
-        (pin (num 11) (name VDD) (type power_in))
-        (pin (num 12) (name PA4) (type BiDi))
-        (pin (num 13) (name PA5) (type BiDi))
-        (pin (num 14) (name PA6) (type BiDi))
-        (pin (num 15) (name PA7) (type BiDi))
-        (pin (num 16) (name PA8) (type BiDi))
-        (pin (num 17) (name PA9) (type BiDi))
-        (pin (num 18) (name NRST) (type BiDi))
-        (pin (num 19) (name PH3-BOOT0) (type BiDi))
-        (pin (num 20) (name RFI_P) (type input))
-        (pin (num 21) (name RFI_N) (type input))
-        (pin (num 22) (name RFO_LP) (type output))
-        (pin (num 23) (name RFO_HP) (type output))
-        (pin (num 24) (name VR_PA) (type power_out))
-        (pin (num 25) (name VDD_PA) (type power_out))
-        (pin (num 26) (name OSC_IN) (type input))
-        (pin (num 27) (name OSC_OUT) (type output))
-        (pin (num 28) (name VDDRF) (type power_in))
-        (pin (num 29) (name VDDRF1V55) (type power_in))
-        (pin (num 30) (name PB0-VDD_TCXO) (type BiDi))
-        (pin (num 31) (name PB2) (type BiDi))
-        (pin (num 32) (name PB12) (type BiDi))
-        (pin (num 33) (name PA10) (type BiDi))
-        (pin (num 34) (name PA11) (type BiDi))
-        (pin (num 35) (name PA12) (type BiDi))
-        (pin (num 36) (name PA13) (type BiDi))
-        (pin (num 37) (name VBAT) (type power_in))
-        (pin (num 38) (name PC13) (type BiDi))
-        (pin (num 39) (name PC14_OSC32_IN) (type BiDi))
-        (pin (num 40) (name PC15_OSC32_OUT) (type BiDi))
-        (pin (num 41) (name VDDA) (type power_in))
-        (pin (num 42) (name PA14) (type BiDi))
-        (pin (num 43) (name PA15) (type BiDi))
-        (pin (num 44) (name VDD) (type power_in))
-        (pin (num 45) (name VFBSMPS) (type input))
-        (pin (num 46) (name VDDSMPS) (type power_in))
-        (pin (num 47) (name VLXSMPS) (type input))
-        (pin (num 48) (name VSSSMPS) (type power_in))
-        (pin (num 49) (name EP) (type power_in))))
     (libpart (lib Elabdev) (part TPS73533DRV)
       (description "3.3V 500mA, Low Quiescent Current, Low Noise, High PSRR, Low-Dropout Linear Regulator, WSON-6")
       (docs https://www.ti.com/lit/ds/symlink/tps735.pdf)
@@ -1259,7 +1192,7 @@
     (library (logical Device)
       (uri /usr/share/kicad/library/Device.lib))
     (library (logical Elabdev)
-      (uri /home/mschloh/Projects/circuit/nlnet-dscomm/hardware/libraries/elabdev.lib))
+      (uri libraries/elabdev.lib))
     (library (logical Jumper)
       (uri /usr/share/kicad/library/Jumper.lib))
     (library (logical Mechanical)
@@ -1269,475 +1202,376 @@
     (library (logical Switch)
       (uri /usr/share/kicad/library/Switch.lib)))
   (nets
-    (net (code 1) (name /Sheet5F53D5B4/SWDCLK)
+    (net (code 1) (name /Sheet60040980/SWDCLK)
+      (node (ref J3) (pin 4))
+      (node (ref U6) (pin D5)))
+    (net (code 2) (name /Sheet5F53D5B4/SWDCLK)
       (node (ref J3) (pin 2))
       (node (ref U6) (pin C5)))
-    (net (code 2) (name /Sheet5F53D5B4/I2C_SCL)
-      (node (ref U6) (pin E6))
+    (net (code 3) (name /Sheet5F53D5B4/I2C_SCL)
+      (node (ref R7) (pin 2))
       (node (ref U4) (pin 6))
-      (node (ref R7) (pin 2)))
-    (net (code 3) (name /Sheet5F53D5B4/I2C_SDA)
-      (node (ref U6) (pin F7))
+      (node (ref U6) (pin E6)))
+    (net (code 4) (name /Sheet5F53D5B4/I2C_SDA)
+      (node (ref R8) (pin 2))
       (node (ref U4) (pin 5))
-      (node (ref R8) (pin 2)))
-    (net (code 4) (name /Sheet5F53D5B4/UART_TX)
+      (node (ref U6) (pin F7)))
+    (net (code 5) (name /Sheet5F53D5B4/UART_TX)
       (node (ref J1) (pin 5))
       (node (ref U6) (pin D3)))
-    (net (code 5) (name /Sheet5F53D5B4/USB_BUS)
-      (node (ref U5) (pin 6))
+    (net (code 6) (name /Sheet5F53D5B4/USB_BUS)
       (node (ref C24) (pin 1))
-      (node (ref C25) (pin 1))
+      (node (ref R2) (pin 1))
+      (node (ref R1) (pin 1))
       (node (ref U6) (pin F3))
       (node (ref U5) (pin 4))
-      (node (ref R1) (pin 1))
-      (node (ref R2) (pin 1)))
-    (net (code 6) (name /Sheet5F53D5B4/USB_P)
+      (node (ref U5) (pin 6))
+      (node (ref C25) (pin 1)))
+    (net (code 7) (name /Sheet5F53D5B4/USB_P)
       (node (ref U3) (pin 1))
-      (node (ref U6) (pin C8))
+      (node (ref J2) (pin A6))
       (node (ref J2) (pin B6))
-      (node (ref J2) (pin A6)))
-    (net (code 7) (name /Sheet5F53D5B4/USB_N)
+      (node (ref U6) (pin C8)))
+    (net (code 8) (name /Sheet5F53D5B4/USB_N)
       (node (ref U6) (pin B8))
       (node (ref U3) (pin 6))
       (node (ref J2) (pin B7))
       (node (ref J2) (pin A7)))
-    (net (code 8) (name /Sheet5F53D5B4/UART_RX)
-      (node (ref J1) (pin 4))
-      (node (ref U6) (pin C4)))
-    (net (code 9) (name /Sheet5F53D5B4/CMDRST)
-      (node (ref R3) (pin 2))
+    (net (code 9) (name /Sheet5F53D5B4/UART_RX)
+      (node (ref U6) (pin C4))
+      (node (ref J1) (pin 4)))
+    (net (code 10) (name /Sheet5F53D5B4/CMDRST)
       (node (ref SW1) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref J3) (pin 10))
       (node (ref C39) (pin 1))
-      (node (ref U6) (pin B6))
-      (node (ref J3) (pin 10)))
-    (net (code 10) (name /Sheet60040980/SWDCLK)
-      (node (ref U6) (pin D5))
-      (node (ref J3) (pin 4)))
+      (node (ref U6) (pin B6)))
     (net (code 11) (name /Sheet5F53D5B4/RFSWPWR)
+      (node (ref XC1) (pin 4))
+      (node (ref C40) (pin 1))
       (node (ref U6) (pin F5))
-      (node (ref C1) (pin 2))
       (node (ref U2) (pin 6))
-      (node (ref XC1) (pin 4))
-      (node (ref C40) (pin 1)))
-    (net (code 12) (name /Sheet5F53D5B4/HFOUT)
-      (node (ref C18) (pin 1))
-      (node (ref U6) (pin B1))
-      (node (ref C14) (pin 1))
-      (node (ref L6) (pin 2)))
+      (node (ref C1) (pin 2)))
+    (net (code 12) (name /Sheet5F53D5B4/HPOUT)
+      (node (ref L3) (pin 2))
+      (node (ref U6) (pin F1)))
     (net (code 13) (name /Sheet5F53D5B4/POWAMP)
+      (node (ref L4) (pin 2))
       (node (ref C10) (pin 1))
       (node (ref C11) (pin 1))
-      (node (ref U6) (pin D1))
       (node (ref L6) (pin 1))
-      (node (ref L4) (pin 2)))
-    (net (code 14) (name /Sheet5F53D5B4/HPOUT)
-      (node (ref L3) (pin 2))
-      (node (ref U6) (pin F1)))
-    (net (code 15) (name /Sheet5F53D5B4/XCEIV)
-      (node (ref U6) (pin D2))
-      (node (ref U2) (pin 5)))
-    (net (code 16) (name /Sheet5F53D5B4/HFIN)
+      (node (ref U6) (pin D1)))
+    (net (code 14) (name /Sheet5F53D5B4/HFOUT)
+      (node (ref C18) (pin 1))
+      (node (ref C14) (pin 1))
+      (node (ref U6) (pin B1))
+      (node (ref L6) (pin 2)))
+    (net (code 15) (name /Sheet5F53D5B4/HFIN)
       (node (ref U6) (pin A1))
       (node (ref L5) (pin 2)))
-    (net (code 17) (name +3V3)
-      (node (ref R9) (pin 1))
-      (node (ref C25) (pin 2))
-      (node (ref R10) (pin 1))
-      (node (ref C5) (pin 2))
-      (node (ref C35) (pin 1))
-      (node (ref C35) (pin 2))
-      (node (ref AE3) (pin 1))
+    (net (code 16) (name /Sheet5F53D5B4/XCEIV)
+      (node (ref U6) (pin D2))
+      (node (ref U2) (pin 5)))
+    (net (code 17) (name /Sheet5F53D5B4/BANDSEL)
+      (node (ref U6) (pin F6))
+      (node (ref U2) (pin 4)))
+    (net (code 18) (name "Net-(R11-Pad1)")
+      (node (ref R11) (pin 1))
+      (node (ref SW1) (pin 2)))
+    (net (code 19) (name "Net-(U6-PadG1)")
+      (node (ref U6) (pin G1)))
+    (net (code 20) (name "Net-(U6-PadH1)")
+      (node (ref U6) (pin H1)))
+    (net (code 21) (name /Sheet5F53D5B4/CN_VBAT)
+      (node (ref J4) (pin 2))
+      (node (ref U6) (pin C3)))
+    (net (code 22) (name "Net-(BT1-Pad1)")
+      (node (ref J4) (pin 1))
+      (node (ref BT1) (pin 1)))
+    (net (code 23) (name "Net-(C20-Pad1)")
+      (node (ref U6) (pin C1))
+      (node (ref U6) (pin C2))
+      (node (ref C22) (pin 1))
+      (node (ref FB1) (pin 2))
+      (node (ref U6) (pin H3))
+      (node (ref C23) (pin 1))
+      (node (ref C28) (pin 1))
+      (node (ref C21) (pin 1))
+      (node (ref C20) (pin 1)))
+    (net (code 24) (name /Sheet5F53D5B4/CRYSTAL_XOUT-RESERVED)
+      (node (ref U6) (pin G8)))
+    (net (code 25) (name +3V3)
+      (node (ref C15) (pin 2))
+      (node (ref C16) (pin 2))
+      (node (ref C17) (pin 2))
       (node (ref C18) (pin 2))
-      (node (ref AE4) (pin 2))
+      (node (ref U2) (pin 8))
+      (node (ref U2) (pin 7))
+      (node (ref U2) (pin 2))
+      (node (ref U2) (pin 12))
+      (node (ref U2) (pin 10))
+      (node (ref J3) (pin 1))
+      (node (ref R3) (pin 1))
+      (node (ref SW2) (pin 2))
+      (node (ref AE3) (pin 1))
+      (node (ref C10) (pin 2))
       (node (ref AE7) (pin 2))
       (node (ref AE6) (pin 2))
-      (node (ref C17) (pin 2))
-      (node (ref JP1) (pin 2))
+      (node (ref AE4) (pin 2))
       (node (ref C4) (pin 2))
-      (node (ref U6) (pin E2))
+      (node (ref C5) (pin 2))
+      (node (ref C6) (pin 2))
       (node (ref C7) (pin 2))
-      (node (ref U2) (pin 2))
-      (node (ref U2) (pin 7))
+      (node (ref C9) (pin 2))
       (node (ref C1) (pin 1))
-      (node (ref U2) (pin 8))
-      (node (ref U2) (pin 10))
       (node (ref AE2) (pin 2))
-      (node (ref U2) (pin 12))
-      (node (ref C6) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref C24) (pin 2))
-      (node (ref C23) (pin 2))
-      (node (ref C15) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref C20) (pin 2))
+      (node (ref U5) (pin 3))
+      (node (ref U5) (pin 7))
+      (node (ref C26) (pin 2))
       (node (ref C11) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref C21) (pin 2))
-      (node (ref U6) (pin H8))
-      (node (ref R2) (pin 2))
-      (node (ref U3) (pin 2))
-      (node (ref C28) (pin 2))
-      (node (ref J4) (pin 3))
-      (node (ref C39) (pin 2))
-      (node (ref J2) (pin B12))
-      (node (ref J2) (pin A1))
-      (node (ref J2) (pin A12))
-      (node (ref J2) (pin B1))
-      (node (ref C40) (pin 2))
-      (node (ref XC1) (pin 2))
-      (node (ref Y1) (pin 2))
-      (node (ref C37) (pin 2))
-      (node (ref BT1) (pin 2))
-      (node (ref C38) (pin 2))
-      (node (ref C32) (pin 2))
-      (node (ref C33) (pin 2))
-      (node (ref R7) (pin 1))
-      (node (ref C34) (pin 2))
       (node (ref R8) (pin 1))
+      (node (ref R7) (pin 1))
       (node (ref R11) (pin 2))
-      (node (ref C26) (pin 2))
-      (node (ref C27) (pin 2))
-      (node (ref U5) (pin 7))
-      (node (ref U5) (pin 3))
+      (node (ref C39) (pin 2))
+      (node (ref J4) (pin 3))
+      (node (ref BT1) (pin 2))
+      (node (ref U3) (pin 2))
+      (node (ref R4) (pin 2))
       (node (ref U4) (pin 8))
+      (node (ref R2) (pin 2))
       (node (ref U4) (pin 4))
-      (node (ref SW2) (pin 2))
-      (node (ref C22) (pin 2))
-      (node (ref U6) (pin A8))
-      (node (ref U6) (pin A7))
-      (node (ref U6) (pin A4))
-      (node (ref FB1) (pin 1))
-      (node (ref R3) (pin 1))
-      (node (ref U6) (pin G4))
-      (node (ref J3) (pin 1))
+      (node (ref C25) (pin 2))
+      (node (ref C24) (pin 2))
       (node (ref J1) (pin 1))
-      (node (ref R4) (pin 2))
+      (node (ref J3) (pin 5))
+      (node (ref C27) (pin 2))
+      (node (ref J3) (pin 3))
+      (node (ref C23) (pin 2))
       (node (ref R5) (pin 2))
-      (node (ref C29) (pin 1))
-      (node (ref C19) (pin 2))
+      (node (ref J2) (pin B1))
+      (node (ref J2) (pin A12))
+      (node (ref J2) (pin A1))
+      (node (ref J2) (pin B12))
       (node (ref R6) (pin 2))
-      (node (ref C31) (pin 1))
+      (node (ref C19) (pin 2))
+      (node (ref C21) (pin 2))
+      (node (ref C20) (pin 2))
+      (node (ref C35) (pin 1))
+      (node (ref C35) (pin 2))
+      (node (ref J3) (pin 9))
       (node (ref C30) (pin 2))
+      (node (ref C31) (pin 1))
+      (node (ref C31) (pin 2))
+      (node (ref C34) (pin 2))
       (node (ref C30) (pin 1))
+      (node (ref C33) (pin 2))
+      (node (ref C22) (pin 2))
+      (node (ref C28) (pin 2))
+      (node (ref U6) (pin H8))
+      (node (ref R10) (pin 1))
+      (node (ref R9) (pin 1))
+      (node (ref U6) (pin E2))
+      (node (ref U6) (pin A8))
+      (node (ref U6) (pin A7))
+      (node (ref U6) (pin A2))
+      (node (ref C36) (pin 2))
+      (node (ref U6) (pin F2))
+      (node (ref U6) (pin B2))
+      (node (ref U6) (pin E1))
+      (node (ref U6) (pin D6))
+      (node (ref U6) (pin D4))
       (node (ref C29) (pin 2))
-      (node (ref J3) (pin 9))
-      (node (ref J3) (pin 5))
-      (node (ref J3) (pin 3))
-      (node (ref C36) (pin 2)))
-    (net (code 18) (name /Sheet5F53D5B4/BANDSEL)
-      (node (ref U6) (pin F6))
-      (node (ref U2) (pin 4)))
-    (net (code 19) (name "Net-(U6-PadB4)")
+      (node (ref C29) (pin 1))
+      (node (ref U6) (pin H5))
+      (node (ref U6) (pin G7))
+      (node (ref U6) (pin G6))
+      (node (ref U6) (pin G5))
+      (node (ref U6) (pin G4))
+      (node (ref U6) (pin G3))
+      (node (ref U6) (pin G2))
+      (node (ref C32) (pin 2))
+      (node (ref C38) (pin 1))
+      (node (ref U6) (pin B7))
+      (node (ref U6) (pin B5))
+      (node (ref U6) (pin B3))
+      (node (ref JP1) (pin 2))
+      (node (ref C37) (pin 1))
+      (node (ref FB1) (pin 1))
+      (node (ref XC1) (pin 2))
+      (node (ref C40) (pin 2)))
+    (net (code 26) (name "Net-(U6-PadB4)")
       (node (ref U6) (pin B4)))
-    (net (code 20) (name "Net-(U6-PadC7)")
+    (net (code 27) (name "Net-(U6-PadC7)")
       (node (ref U6) (pin C7)))
-    (net (code 21) (name "Net-(U6-PadD7)")
+    (net (code 28) (name "Net-(U6-PadD7)")
       (node (ref U6) (pin D7)))
-    (net (code 22) (name "Net-(U6-PadD8)")
+    (net (code 29) (name "Net-(U6-PadD8)")
       (node (ref U6) (pin D8)))
-    (net (code 23) (name "Net-(U6-PadE3)")
+    (net (code 30) (name "Net-(U6-PadE3)")
       (node (ref U6) (pin E3)))
-    (net (code 24) (name "Net-(U6-PadE4)")
+    (net (code 31) (name "Net-(U6-PadE4)")
       (node (ref U6) (pin E4)))
-    (net (code 25) (name "Net-(U6-PadE5)")
+    (net (code 32) (name "Net-(U6-PadE5)")
       (node (ref U6) (pin E5)))
-    (net (code 26) (name "Net-(C32-Pad1)")
-      (node (ref U6) (pin H4))
-      (node (ref C32) (pin 1)))
-    (net (code 27) (name "Net-(C33-Pad1)")
-      (node (ref U6) (pin H2))
-      (node (ref C33) (pin 1))
-      (node (ref C34) (pin 1)))
-    (net (code 28) (name "Net-(C37-Pad1)")
-      (node (ref C38) (pin 1))
-      (node (ref C37) (pin 1))
-      (node (ref Y1) (pin 1))
-      (node (ref U6) (pin A3)))
-    (net (code 29) (name "Net-(BT1-Pad1)")
-      (node (ref BT1) (pin 1))
-      (node (ref J4) (pin 1)))
-    (net (code 30) (name "Net-(R12-Pad2)")
+    (net (code 33) (name "Net-(U6-PadF4)")
+      (node (ref U6) (pin F4)))
+    (net (code 34) (name /Sheet5F53D5B4/CRYSTAL_XIN-RESERVED)
+      (node (ref U6) (pin F8)))
+    (net (code 35) (name "Net-(R12-Pad2)")
       (node (ref SW2) (pin 1))
       (node (ref R12) (pin 2)))
-    (net (code 31) (name "Net-(U5-Pad5)")
+    (net (code 36) (name "Net-(C26-Pad1)")
+      (node (ref U5) (pin 1))
+      (node (ref C26) (pin 1))
+      (node (ref JP1) (pin 1)))
+    (net (code 37) (name "Net-(U5-Pad5)")
       (node (ref U5) (pin 5)))
-    (net (code 32) (name "Net-(C27-Pad1)")
-      (node (ref C27) (pin 1))
-      (node (ref U5) (pin 2)))
-    (net (code 33) (name /Sheet5F53D5B4/CRYSTAL_XIN-RESERVED)
-      (node (ref U6) (pin F8)))
-    (net (code 34) (name /Sheet5F53D5B4/CRYSTAL_XOUT-RESERVED)
-      (node (ref U6) (pin G8)))
-    (net (code 35) (name "Net-(U6-PadH1)")
-      (node (ref U6) (pin H1)))
-    (net (code 36) (name "Net-(U6-PadG1)")
-      (node (ref U6) (pin G1)))
-    (net (code 37) (name "Net-(R11-Pad1)")
-      (node (ref SW1) (pin 2))
-      (node (ref R11) (pin 1)))
-    (net (code 38) (name "Net-(U6-PadF4)")
-      (node (ref U6) (pin F4)))
-    (net (code 39) (name /Sheet5F53D5B4/CN_VBAT)
-      (node (ref U6) (pin C3))
-      (node (ref J4) (pin 2)))
-    (net (code 40) (name "Net-(U6-PadA2)")
-      (node (ref U6) (pin A2))
-      (node (ref U6) (pin G2))
-      (node (ref U6) (pin B2))
-      (node (ref U6) (pin F2))
-      (node (ref U6) (pin G3))
-      (node (ref U6) (pin G5))
-      (node (ref U6) (pin G6))
-      (node (ref U6) (pin G7))
-      (node (ref U6) (pin H5))
-      (node (ref U6) (pin B3))
-      (node (ref U6) (pin B5))
-      (node (ref U6) (pin B7))
-      (node (ref U6) (pin D4))
-      (node (ref U6) (pin D6))
-      (node (ref U6) (pin E1)))
-    (net (code 41) (name "Net-(XC1-Pad1)")
+    (net (code 38) (name "Net-(C27-Pad1)")
+      (node (ref U5) (pin 2))
+      (node (ref C27) (pin 1)))
+    (net (code 39) (name "Net-(XC1-Pad1)")
       (node (ref XC1) (pin 1)))
-    (net (code 42) (name "Net-(C31-Pad2)")
-      (node (ref C31) (pin 2)))
+    (net (code 40) (name "Net-(C33-Pad1)")
+      (node (ref C33) (pin 1))
+      (node (ref U6) (pin H2))
+      (node (ref C34) (pin 1)))
+    (net (code 41) (name "Net-(C37-Pad2)")
+      (node (ref C37) (pin 2))
+      (node (ref U6) (pin A3))
+      (node (ref Y1) (pin 1)))
+    (net (code 42) (name "Net-(L10-Pad2)")
+      (node (ref L10) (pin 2))
+      (node (ref U6) (pin A6)))
     (net (code 43) (name "Net-(C36-Pad1)")
-      (node (ref U6) (pin A5))
+      (node (ref L10) (pin 1))
       (node (ref C36) (pin 1))
-      (node (ref L10) (pin 1)))
-    (net (code 44) (name "Net-(L10-Pad2)")
-      (node (ref U6) (pin A6))
-      (node (ref L10) (pin 2)))
-    (net (code 45) (name "Net-(C20-Pad1)")
-      (node (ref U6) (pin H3))
-      (node (ref U6) (pin C1))
-      (node (ref C22) (pin 1))
-      (node (ref U6) (pin C2))
-      (node (ref C21) (pin 1))
-      (node (ref C20) (pin 1))
-      (node (ref C28) (pin 1))
-      (node (ref C23) (pin 1))
-      (node (ref FB1) (pin 2)))
-    (net (code 46) (name "Net-(D2-Pad1)")
-      (node (ref U6) (pin E8))
-      (node (ref D2) (pin 1)))
+      (node (ref U6) (pin A5)))
+    (net (code 44) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref U6) (pin C6)))
+    (net (code 45) (name "Net-(C32-Pad1)")
+      (node (ref C32) (pin 1))
+      (node (ref U6) (pin H4)))
+    (net (code 46) (name "Net-(C38-Pad2)")
+      (node (ref U6) (pin A4))
+      (node (ref Y1) (pin 2))
+      (node (ref C38) (pin 2)))
     (net (code 47) (name "Net-(U6-PadH6)")
-      (node (ref U6) (pin H6))
-      (node (ref XC1) (pin 3)))
+      (node (ref XC1) (pin 3))
+      (node (ref U6) (pin H6)))
     (net (code 48) (name "Net-(U6-PadH7)")
       (node (ref U6) (pin H7)))
-    (net (code 49) (name "Net-(R12-Pad1)")
-      (node (ref U6) (pin C6))
-      (node (ref R12) (pin 1)))
-    (net (code 50) (name "Net-(C26-Pad1)")
-      (node (ref U5) (pin 1))
-      (node (ref C26) (pin 1))
-      (node (ref JP1) (pin 1)))
-    (net (code 51) (name "Net-(D1-Pad1)")
+    (net (code 49) (name "Net-(D2-Pad2)")
+      (node (ref R10) (pin 2))
+      (node (ref D2) (pin 2)))
+    (net (code 50) (name "Net-(D1-Pad1)")
       (node (ref U6) (pin E7))
       (node (ref D1) (pin 1)))
+    (net (code 51) (name "Net-(D2-Pad1)")
+      (node (ref D2) (pin 1))
+      (node (ref U6) (pin E8)))
     (net (code 52) (name "Net-(D1-Pad2)")
-      (node (ref D1) (pin 2))
-      (node (ref R9) (pin 2)))
-    (net (code 53) (name "Net-(D2-Pad2)")
-      (node (ref R10) (pin 2))
-      (node (ref D2) (pin 2)))
-    (net (code 54) (name "Net-(U1-Pad43)")
-      (node (ref U1) (pin 43)))
-    (net (code 55) (name "Net-(U1-Pad32)")
-      (node (ref U1) (pin 32)))
-    (net (code 56) (name "Net-(U1-Pad33)")
-      (node (ref U1) (pin 33)))
-    (net (code 57) (name "Net-(U1-Pad34)")
-      (node (ref U1) (pin 34)))
-    (net (code 58) (name "Net-(U1-Pad35)")
-      (node (ref U1) (pin 35)))
-    (net (code 59) (name "Net-(U1-Pad36)")
-      (node (ref U1) (pin 36)))
-    (net (code 60) (name "Net-(U1-Pad37)")
-      (node (ref U1) (pin 37)))
-    (net (code 61) (name "Net-(U1-Pad38)")
-      (node (ref U1) (pin 38)))
-    (net (code 62) (name "Net-(U1-Pad39)")
-      (node (ref U1) (pin 39)))
-    (net (code 63) (name "Net-(U1-Pad4)")
-      (node (ref U1) (pin 4)))
-    (net (code 64) (name "Net-(U1-Pad40)")
-      (node (ref U1) (pin 40)))
-    (net (code 65) (name "Net-(U1-Pad41)")
-      (node (ref U1) (pin 41)))
-    (net (code 66) (name "Net-(U1-Pad42)")
-      (node (ref U1) (pin 42)))
-    (net (code 67) (name "Net-(U1-Pad1)")
-      (node (ref U1) (pin 1)))
-    (net (code 68) (name "Net-(U1-Pad44)")
-      (node (ref U1) (pin 44)))
-    (net (code 69) (name "Net-(U1-Pad45)")
-      (node (ref U1) (pin 45)))
-    (net (code 70) (name "Net-(U1-Pad46)")
-      (node (ref U1) (pin 46)))
-    (net (code 71) (name "Net-(U1-Pad47)")
-      (node (ref U1) (pin 47)))
-    (net (code 72) (name "Net-(U1-Pad48)")
-      (node (ref U1) (pin 48)))
-    (net (code 73) (name "Net-(U1-Pad49)")
-      (node (ref U1) (pin 49)))
-    (net (code 74) (name "Net-(U1-Pad5)")
-      (node (ref U1) (pin 5)))
-    (net (code 75) (name "Net-(U1-Pad6)")
-      (node (ref U1) (pin 6)))
-    (net (code 76) (name "Net-(U1-Pad7)")
-      (node (ref U1) (pin 7)))
-    (net (code 77) (name "Net-(U1-Pad8)")
-      (node (ref U1) (pin 8)))
-    (net (code 78) (name "Net-(U1-Pad9)")
-      (node (ref U1) (pin 9)))
-    (net (code 79) (name "Net-(U1-Pad30)")
-      (node (ref U1) (pin 30)))
-    (net (code 80) (name "Net-(U1-Pad31)")
-      (node (ref U1) (pin 31)))
-    (net (code 81) (name "Net-(U1-Pad10)")
-      (node (ref U1) (pin 10)))
-    (net (code 82) (name "Net-(U1-Pad11)")
-      (node (ref U1) (pin 11)))
-    (net (code 83) (name "Net-(U1-Pad12)")
-      (node (ref U1) (pin 12)))
-    (net (code 84) (name "Net-(U1-Pad13)")
-      (node (ref U1) (pin 13)))
-    (net (code 85) (name "Net-(U1-Pad14)")
-      (node (ref U1) (pin 14)))
-    (net (code 86) (name "Net-(U1-Pad15)")
-      (node (ref U1) (pin 15)))
-    (net (code 87) (name "Net-(U1-Pad16)")
-      (node (ref U1) (pin 16)))
-    (net (code 88) (name "Net-(U1-Pad17)")
-      (node (ref U1) (pin 17)))
-    (net (code 89) (name "Net-(U1-Pad18)")
-      (node (ref U1) (pin 18)))
-    (net (code 90) (name "Net-(U1-Pad19)")
-      (node (ref U1) (pin 19)))
-    (net (code 91) (name "Net-(U1-Pad2)")
-      (node (ref U1) (pin 2)))
-    (net (code 92) (name "Net-(U1-Pad21)")
-      (node (ref U1) (pin 21)))
-    (net (code 93) (name "Net-(U1-Pad20)")
-      (node (ref U1) (pin 20)))
-    (net (code 94) (name "Net-(U1-Pad3)")
-      (node (ref U1) (pin 3)))
-    (net (code 95) (name "Net-(U1-Pad29)")
-      (node (ref U1) (pin 29)))
-    (net (code 96) (name "Net-(U1-Pad28)")
-      (node (ref U1) (pin 28)))
-    (net (code 97) (name "Net-(U1-Pad27)")
-      (node (ref U1) (pin 27)))
-    (net (code 98) (name "Net-(U1-Pad25)")
-      (node (ref U1) (pin 25)))
-    (net (code 99) (name "Net-(U1-Pad24)")
-      (node (ref U1) (pin 24)))
-    (net (code 100) (name "Net-(U1-Pad23)")
-      (node (ref U1) (pin 23)))
-    (net (code 101) (name "Net-(U1-Pad22)")
-      (node (ref U1) (pin 22)))
-    (net (code 102) (name "Net-(U1-Pad26)")
-      (node (ref U1) (pin 26)))
-    (net (code 103) (name "Net-(C3-Pad2)")
+      (node (ref R9) (pin 2))
+      (node (ref D1) (pin 2)))
+    (net (code 53) (name "Net-(C3-Pad2)")
+      (node (ref C6) (pin 1))
       (node (ref C3) (pin 2))
-      (node (ref L2) (pin 2))
-      (node (ref C6) (pin 1)))
-    (net (code 104) (name "Net-(C2-Pad1)")
-      (node (ref C5) (pin 1))
-      (node (ref L1) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref L2) (pin 1)))
-    (net (code 105) (name "Net-(C3-Pad1)")
-      (node (ref C7) (pin 1))
-      (node (ref L4) (pin 1))
-      (node (ref C3) (pin 1))
-      (node (ref L3) (pin 1)))
-    (net (code 106) (name "Net-(C2-Pad2)")
-      (node (ref U2) (pin 1))
+      (node (ref L2) (pin 2)))
+    (net (code 54) (name "Net-(C2-Pad2)")
       (node (ref C2) (pin 2))
       (node (ref L1) (pin 1))
-      (node (ref C4) (pin 1)))
-    (net (code 107) (name "Net-(C8-Pad1)")
+      (node (ref C4) (pin 1))
+      (node (ref U2) (pin 1)))
+    (net (code 55) (name "Net-(C3-Pad1)")
+      (node (ref L3) (pin 1))
+      (node (ref L4) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref C7) (pin 1)))
+    (net (code 56) (name "Net-(C2-Pad1)")
+      (node (ref C2) (pin 1))
+      (node (ref L2) (pin 1))
+      (node (ref L1) (pin 2))
+      (node (ref C5) (pin 1)))
+    (net (code 57) (name "Net-(AE5-Pad1)")
+      (node (ref AE5) (pin 1)))
+    (net (code 58) (name "Net-(C8-Pad1)")
+      (node (ref L5) (pin 1))
       (node (ref C9) (pin 1))
-      (node (ref C8) (pin 1))
-      (node (ref L5) (pin 1)))
-    (net (code 108) (name "Net-(C8-Pad2)")
-      (node (ref C8) (pin 2))
-      (node (ref U2) (pin 9)))
-    (net (code 109) (name "Net-(C12-Pad2)")
-      (node (ref C15) (pin 1))
+      (node (ref C8) (pin 1)))
+    (net (code 59) (name "Net-(C8-Pad2)")
+      (node (ref U2) (pin 9))
+      (node (ref C8) (pin 2)))
+    (net (code 60) (name "Net-(C12-Pad2)")
       (node (ref C12) (pin 2))
-      (node (ref L7) (pin 1))
-      (node (ref U2) (pin 3)))
-    (net (code 110) (name "Net-(C12-Pad1)")
-      (node (ref C13) (pin 2))
-      (node (ref C12) (pin 1))
-      (node (ref C16) (pin 1))
-      (node (ref L7) (pin 2))
-      (node (ref L8) (pin 1)))
-    (net (code 111) (name "Net-(C13-Pad1)")
+      (node (ref C15) (pin 1))
+      (node (ref U2) (pin 3))
+      (node (ref L7) (pin 1)))
+    (net (code 61) (name "Net-(C13-Pad1)")
       (node (ref C17) (pin 1))
+      (node (ref L8) (pin 2))
       (node (ref L9) (pin 1))
-      (node (ref C13) (pin 1))
-      (node (ref L8) (pin 2)))
-    (net (code 112) (name "Net-(C14-Pad2)")
-      (node (ref L9) (pin 2))
-      (node (ref C14) (pin 2)))
-    (net (code 113) (name "Net-(AE5-Pad1)")
-      (node (ref AE5) (pin 1)))
-    (net (code 114) (name "Net-(AE1-Pad1)")
-      (node (ref AE1) (pin 1))
-      (node (ref AE7) (pin 1))
-      (node (ref U2) (pin 11))
-      (node (ref AE6) (pin 1))
+      (node (ref C13) (pin 1)))
+    (net (code 62) (name "Net-(C14-Pad2)")
+      (node (ref C14) (pin 2))
+      (node (ref L9) (pin 2)))
+    (net (code 63) (name "Net-(C12-Pad1)")
+      (node (ref C16) (pin 1))
+      (node (ref L8) (pin 1))
+      (node (ref C13) (pin 2))
+      (node (ref C12) (pin 1))
+      (node (ref L7) (pin 2)))
+    (net (code 64) (name "Net-(AE1-Pad1)")
       (node (ref AE2) (pin 1))
-      (node (ref AE5) (pin 2))
+      (node (ref AE6) (pin 1))
       (node (ref AE3) (pin 2))
-      (node (ref AE4) (pin 1)))
-    (net (code 115) (name "Net-(J1-Pad6)")
-      (node (ref J1) (pin 6)))
-    (net (code 116) (name "Net-(J1-Pad3)")
-      (node (ref J1) (pin 3))
-      (node (ref TP1) (pin 1)))
-    (net (code 117) (name "Net-(J3-Pad6)")
-      (node (ref J3) (pin 6)))
-    (net (code 118) (name "Net-(J3-Pad8)")
+      (node (ref AE5) (pin 2))
+      (node (ref AE1) (pin 1))
+      (node (ref AE4) (pin 1))
+      (node (ref AE7) (pin 1))
+      (node (ref U2) (pin 11)))
+    (net (code 65) (name "Net-(J3-Pad8)")
       (node (ref J3) (pin 8)))
-    (net (code 119) (name "Net-(J2-PadA5)")
-      (node (ref R5) (pin 1))
-      (node (ref J2) (pin A5)))
-    (net (code 120) (name "Net-(J2-PadB5)")
+    (net (code 66) (name "Net-(J3-Pad6)")
+      (node (ref J3) (pin 6)))
+    (net (code 67) (name "Net-(J3-Pad7)")
+      (node (ref J3) (pin 7)))
+    (net (code 68) (name "Net-(J1-Pad6)")
+      (node (ref J1) (pin 6)))
+    (net (code 69) (name "Net-(J2-PadB5)")
       (node (ref J2) (pin B5))
       (node (ref R4) (pin 1)))
-    (net (code 121) (name "Net-(J2-PadA8)")
+    (net (code 70) (name "Net-(J2-PadA8)")
       (node (ref J2) (pin A8)))
-    (net (code 122) (name "Net-(J2-PadB8)")
+    (net (code 71) (name "Net-(J2-PadB8)")
       (node (ref J2) (pin B8)))
-    (net (code 123) (name "Net-(J1-Pad2)")
+    (net (code 72) (name "Net-(J1-Pad2)")
       (node (ref J1) (pin 2)))
-    (net (code 124) (name "Net-(J3-Pad7)")
-      (node (ref J3) (pin 7)))
-    (net (code 125) (name "Net-(C19-Pad1)")
-      (node (ref J2) (pin S1))
+    (net (code 73) (name "Net-(J1-Pad3)")
+      (node (ref J1) (pin 3))
+      (node (ref TP1) (pin 1)))
+    (net (code 74) (name "Net-(C19-Pad1)")
       (node (ref R6) (pin 1))
+      (node (ref J2) (pin S1))
       (node (ref C19) (pin 1)))
-    (net (code 126) (name "Net-(U3-Pad3)")
+    (net (code 75) (name "Net-(J2-PadA5)")
+      (node (ref R5) (pin 1))
+      (node (ref J2) (pin A5)))
+    (net (code 76) (name "Net-(U3-Pad3)")
       (node (ref U3) (pin 3)))
-    (net (code 127) (name "Net-(U3-Pad4)")
+    (net (code 77) (name "Net-(U3-Pad4)")
       (node (ref U3) (pin 4)))
-    (net (code 128) (name "Net-(J2-PadA4)")
-      (node (ref R1) (pin 2))
-      (node (ref J2) (pin B4))
+    (net (code 78) (name "Net-(J2-PadA4)")
+      (node (ref J2) (pin A4))
       (node (ref J2) (pin A9))
-      (node (ref U3) (pin 5))
+      (node (ref J2) (pin B4))
       (node (ref J2) (pin B9))
-      (node (ref J2) (pin A4)))
-    (net (code 129) (name "Net-(U4-Pad7)")
-      (node (ref U4) (pin 7)))
-    (net (code 130) (name "Net-(U4-Pad3)")
-      (node (ref U4) (pin 3)))
-    (net (code 131) (name "Net-(U4-Pad1)")
+      (node (ref R1) (pin 2))
+      (node (ref U3) (pin 5)))
+    (net (code 79) (name "Net-(U4-Pad1)")
       (node (ref U4) (pin 1)))
-    (net (code 132) (name "Net-(U4-Pad2)")
-      (node (ref U4) (pin 2)))))
\ No newline at end of file
+    (net (code 80) (name "Net-(U4-Pad2)")
+      (node (ref U4) (pin 2)))
+    (net (code 81) (name "Net-(U4-Pad3)")
+      (node (ref U4) (pin 3)))
+    (net (code 82) (name "Net-(U4-Pad7)")
+      (node (ref U4) (pin 7)))))
diff --git a/hardware/dscomm.sch b/hardware/dscomm.sch
index 6be0c87..35f1129 100644
--- a/hardware/dscomm.sch
+++ b/hardware/dscomm.sch
@@ -137,28 +137,6 @@ F 3 "" H 1750 7400 50  0001 C CNN
 	1    1750 7400
 	1    0    0    -1  
 $EndComp
-$Comp
-L power:PWR_FLAG #FLG01
-U 1 1 5F542A12
-P 2950 7400
-F 0 "#FLG01" H 2950 7475 50  0001 C CNN
-F 1 "PWR_FLAG" H 2950 7573 50  0000 C CNN
-F 2 "" H 2950 7400 50  0001 C CNN
-F 3 "~" H 2950 7400 50  0001 C CNN
-	1    2950 7400
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR02
-U 1 1 5F543015
-P 2950 7400
-F 0 "#PWR02" H 2950 7150 50  0001 C CNN
-F 1 "GND" H 2955 7227 50  0000 C CNN
-F 2 "" H 2950 7400 50  0001 C CNN
-F 3 "" H 2950 7400 50  0001 C CNN
-	1    2950 7400
-	1    0    0    -1  
-$EndComp
 $Sheet
 S 3400 1150 1200 800 
 U 5F5C0728
@@ -172,30 +150,6 @@ F6 "POWAMP" I L 3400 1750 50
 F7 "HFOUT" I L 3400 1550 50 
 F8 "RFSWPWR" I L 3400 1850 50 
 $EndSheet
-$Comp
-L power:+3V3 #PWR03
-U 1 1 5F95DD9E
-P 3350 7400
-F 0 "#PWR03" H 3350 7250 50  0001 C CNN
-F 1 "+3V3" H 3365 7573 50  0000 C CNN
-F 2 "" H 3350 7400 50  0001 C CNN
-F 3 "" H 3350 7400 50  0001 C CNN
-	1    3350 7400
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:PWR_FLAG #FLG02
-U 1 1 5F95E428
-P 3750 7400
-F 0 "#FLG02" H 3750 7475 50  0001 C CNN
-F 1 "PWR_FLAG" H 3750 7573 50  0000 C CNN
-F 2 "" H 3750 7400 50  0001 C CNN
-F 3 "~" H 3750 7400 50  0001 C CNN
-	1    3750 7400
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3350 7400 3750 7400
 $Sheet
 S 3400 2350 1200 1000
 U 60040981
diff --git a/hardware/pwr-stmicro.sch b/hardware/pwr-stmicro.sch
index 5d20cc6..38e24e7 100644
--- a/hardware/pwr-stmicro.sch
+++ b/hardware/pwr-stmicro.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 8
+Sheet 5 8
 Title "Democratic Sendcomm"
 Date "2020-09-08"
 Rev "0.8.0"