From 264021c1d21d887a79d2bfa783e6beaecd813514 Mon Sep 17 00:00:00 2001
From: Kelvin Ly <kelvin.ly1618@gmail.com>
Date: Sun, 22 Sep 2019 20:10:10 -0400
Subject: [PATCH] Reannotate everything; I'm trying to cut down the number of
 components

---
 pcb/discrete/discrete-rf-board/dac.sch        | 152 +++---
 pcb/discrete/discrete-rf-board/dac.sch-bak    |  24 +-
 .../discrete-rf-board/diode_mixer.sch         | 194 ++++----
 .../discrete-rf-board/diode_mixer.sch-bak     |  18 +-
 .../discrete-rf-board/discrete-rf-board.sch   | 259 +++--------
 .../discrete-rf-board.sch-bak                 | 190 ++------
 pcb/discrete/discrete-rf-board/if_amp.sch     | 440 +++++++++---------
 pcb/discrete/discrete-rf-board/if_amp.sch-bak |  66 ++-
 pcb/discrete/discrete-rf-board/lna.sch        |  40 +-
 pcb/discrete/discrete-rf-board/lna.sch-bak    |   6 +-
 .../discrete-rf-board/lna_gain_block.sch      | 298 ++++++------
 .../discrete-rf-board/lna_gain_block.sch-bak  | 221 +++++----
 pcb/discrete/discrete-rf-board/lo.sch         | 304 ++++++------
 pcb/discrete/discrete-rf-board/lo.sch-bak     |  30 +-
 pcb/discrete/discrete-rf-board/mixer.sch      | 382 +++++++--------
 pcb/discrete/discrete-rf-board/mixer.sch-bak  |  33 +-
 pcb/discrete/discrete-rf-board/pa.sch         | 136 +++---
 pcb/discrete/discrete-rf-board/pa.sch-bak     |  18 +-
 pcb/discrete/discrete-rf-board/receiver.sch   | 164 +++----
 .../discrete-rf-board/receiver.sch-bak        |  18 +-
 .../switchable-attenuator.sch                 |  66 +--
 .../switchable-attenuator.sch-bak             |  46 +-
 .../discrete-rf-board/transmitter.sch         |  40 +-
 23 files changed, 1505 insertions(+), 1640 deletions(-)

diff --git a/pcb/discrete/discrete-rf-board/dac.sch b/pcb/discrete/discrete-rf-board/dac.sch
index 250497a..0842fda 100644
--- a/pcb/discrete/discrete-rf-board/dac.sch
+++ b/pcb/discrete/discrete-rf-board/dac.sch
@@ -15,12 +15,12 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:R_Small R49
+L Device:R_Small R51
 U 1 1 5D9928CB
 P 3550 2700
-AR Path="/5CA6B0B3/5D83265A/5D9928CB" Ref="R49"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D9928CB" Ref="R59"  Part="1" 
-F 0 "R59" H 3580 2720 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D9928CB" Ref="R51"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D9928CB" Ref="R61"  Part="1" 
+F 0 "R61" H 3580 2720 50  0000 L CNN
 F 1 "2kR" H 3580 2660 50  0000 L CNN
 F 2 "" H 3550 2700 50  0001 C CNN
 F 3 "~" H 3550 2700 50  0001 C CNN
@@ -28,12 +28,12 @@ F 3 "~" H 3550 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R50
+L Device:R_Small R52
 U 1 1 5D992BF1
 P 3550 3000
-AR Path="/5CA6B0B3/5D83265A/5D992BF1" Ref="R50"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D992BF1" Ref="R60"  Part="1" 
-F 0 "R60" H 3580 3020 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D992BF1" Ref="R52"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D992BF1" Ref="R62"  Part="1" 
+F 0 "R62" H 3580 3020 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 2960 50  0000 L CNN
 F 2 "" H 3550 3000 50  0001 C CNN
 F 3 "~" H 3550 3000 50  0001 C CNN
@@ -41,12 +41,12 @@ F 3 "~" H 3550 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R51
+L Device:R_Small R53
 U 1 1 5D9933B9
 P 3550 3300
-AR Path="/5CA6B0B3/5D83265A/5D9933B9" Ref="R51"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D9933B9" Ref="R61"  Part="1" 
-F 0 "R61" H 3580 3320 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D9933B9" Ref="R53"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D9933B9" Ref="R63"  Part="1" 
+F 0 "R63" H 3580 3320 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3260 50  0000 L CNN
 F 2 "" H 3550 3300 50  0001 C CNN
 F 3 "~" H 3550 3300 50  0001 C CNN
@@ -54,12 +54,12 @@ F 3 "~" H 3550 3300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R52
+L Device:R_Small R54
 U 1 1 5D993558
 P 3550 3600
-AR Path="/5CA6B0B3/5D83265A/5D993558" Ref="R52"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D993558" Ref="R62"  Part="1" 
-F 0 "R62" H 3580 3620 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D993558" Ref="R54"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D993558" Ref="R64"  Part="1" 
+F 0 "R64" H 3580 3620 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3560 50  0000 L CNN
 F 2 "" H 3550 3600 50  0001 C CNN
 F 3 "~" H 3550 3600 50  0001 C CNN
@@ -67,12 +67,12 @@ F 3 "~" H 3550 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R53
+L Device:R_Small R55
 U 1 1 5D993922
 P 3550 3900
-AR Path="/5CA6B0B3/5D83265A/5D993922" Ref="R53"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D993922" Ref="R63"  Part="1" 
-F 0 "R63" H 3580 3920 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D993922" Ref="R55"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D993922" Ref="R65"  Part="1" 
+F 0 "R65" H 3580 3920 50  0000 L CNN
 F 1 "15kR 1%" H 3580 3860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3550 3900 50  0001 C CNN
 F 3 "~" H 3550 3900 50  0001 C CNN
@@ -81,12 +81,12 @@ F 4 "71-CRCW080515K0FKEBC" H 3550 3900 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R45
+L Device:R_Small R47
 U 1 1 5D994F7A
 P 3350 2850
-AR Path="/5CA6B0B3/5D83265A/5D994F7A" Ref="R45"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D994F7A" Ref="R55"  Part="1" 
-F 0 "R55" V 3450 2800 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D994F7A" Ref="R47"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D994F7A" Ref="R57"  Part="1" 
+F 0 "R57" V 3450 2800 50  0000 L CNN
 F 1 "15kR 1%" V 3550 2750 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 2850 50  0001 C CNN
 F 3 "~" H 3350 2850 50  0001 C CNN
@@ -95,12 +95,12 @@ F 4 "71-CRCW080515K0FKEBC" H 3350 2850 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:R_Small R46
+L Device:R_Small R48
 U 1 1 5D996451
 P 3350 3150
-AR Path="/5CA6B0B3/5D83265A/5D996451" Ref="R46"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D996451" Ref="R56"  Part="1" 
-F 0 "R56" V 3450 3100 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D996451" Ref="R48"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D996451" Ref="R58"  Part="1" 
+F 0 "R58" V 3450 3100 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3050 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3150 50  0001 C CNN
 F 3 "~" H 3350 3150 50  0001 C CNN
@@ -109,12 +109,12 @@ F 4 "71-CRCW080515K0FKEBC" H 3350 3150 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:R_Small R47
+L Device:R_Small R49
 U 1 1 5D99666E
 P 3350 3450
-AR Path="/5CA6B0B3/5D83265A/5D99666E" Ref="R47"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D99666E" Ref="R57"  Part="1" 
-F 0 "R57" V 3450 3400 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D99666E" Ref="R49"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D99666E" Ref="R59"  Part="1" 
+F 0 "R59" V 3450 3400 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3350 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3450 50  0001 C CNN
 F 3 "~" H 3350 3450 50  0001 C CNN
@@ -123,12 +123,12 @@ F 4 "71-CRCW080515K0FKEBC" H 3350 3450 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:R_Small R48
+L Device:R_Small R50
 U 1 1 5D99690F
 P 3350 3750
-AR Path="/5CA6B0B3/5D83265A/5D99690F" Ref="R48"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D99690F" Ref="R58"  Part="1" 
-F 0 "R58" V 3450 3700 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D99690F" Ref="R50"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D99690F" Ref="R60"  Part="1" 
+F 0 "R60" V 3450 3700 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3650 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3750 50  0001 C CNN
 F 3 "~" H 3350 3750 50  0001 C CNN
@@ -167,12 +167,12 @@ Connection ~ 3550 3750
 Wire Wire Line
 	3550 3750 3550 3700
 $Comp
-L Device:Q_NPN_BCE Q20
+L Device:Q_NPN_BCE Q12
 U 1 1 5D998D16
 P 4100 2850
-AR Path="/5CA6B0B3/5D83265A/5D998D16" Ref="Q20"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D998D16" Ref="Q21"  Part="1" 
-F 0 "Q21" H 4300 2900 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D998D16" Ref="Q12"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D998D16" Ref="Q13"  Part="1" 
+F 0 "Q13" H 4300 2900 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 4300 2800 50  0000 L CNN
 F 2 "" H 4300 2950 50  0001 C CNN
 F 3 "~" H 4100 2850 50  0001 C CNN
@@ -192,12 +192,12 @@ Wire Wire Line
 Wire Wire Line
 	3550 1800 3550 1900
 $Comp
-L Device:R_Small R54
+L Device:R_Small R56
 U 1 1 5D99E2FA
 P 4200 3300
-AR Path="/5CA6B0B3/5D83265A/5D99E2FA" Ref="R54"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5D99E2FA" Ref="R64"  Part="1" 
-F 0 "R64" H 4230 3320 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5D99E2FA" Ref="R56"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5D99E2FA" Ref="R66"  Part="1" 
+F 0 "R66" H 4230 3320 50  0000 L CNN
 F 1 "470R" H 4230 3260 50  0000 L CNN
 F 2 "" H 4200 3300 50  0001 C CNN
 F 3 "~" H 4200 3300 50  0001 C CNN
@@ -239,12 +239,12 @@ Wire Wire Line
 	3000 4100 3550 4100
 Connection ~ 3550 4100
 $Comp
-L Device:C_Small C74
+L Device:C_Small C71
 U 1 1 5DC04556
 P 2950 2150
-AR Path="/5CA6B0B3/5D83265A/5DC04556" Ref="C74"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC04556" Ref="C82"  Part="1" 
-F 0 "C82" H 2960 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC04556" Ref="C71"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC04556" Ref="C79"  Part="1" 
+F 0 "C79" H 2960 2220 50  0000 L CNN
 F 1 "1 uF" H 2960 2070 50  0000 L CNN
 F 2 "" H 2950 2150 50  0001 C CNN
 F 3 "~" H 2950 2150 50  0001 C CNN
@@ -252,12 +252,12 @@ F 3 "~" H 2950 2150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C73
+L Device:C_Small C70
 U 1 1 5DC04C84
 P 2600 2150
-AR Path="/5CA6B0B3/5D83265A/5DC04C84" Ref="C73"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC04C84" Ref="C81"  Part="1" 
-F 0 "C81" H 2610 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC04C84" Ref="C70"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC04C84" Ref="C78"  Part="1" 
+F 0 "C78" H 2610 2220 50  0000 L CNN
 F 1 "0.47 uF" H 2610 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2600 2150 50  0001 C CNN
 F 3 "~" H 2600 2150 50  0001 C CNN
@@ -266,12 +266,12 @@ F 4 "963-JMK105BJ474MV-F" H 2600 2150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C72
+L Device:C_Small C69
 U 1 1 5DC04F33
 P 2200 2150
-AR Path="/5CA6B0B3/5D83265A/5DC04F33" Ref="C72"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC04F33" Ref="C80"  Part="1" 
-F 0 "C80" H 2210 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC04F33" Ref="C69"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC04F33" Ref="C77"  Part="1" 
+F 0 "C77" H 2210 2220 50  0000 L CNN
 F 1 "0.1 uF" H 2210 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2200 2150 50  0001 C CNN
 F 3 "~" H 2200 2150 50  0001 C CNN
@@ -280,12 +280,12 @@ F 4 "80-C0402C104M4P" H 2200 2150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C71
+L Device:C_Small C68
 U 1 1 5DC05279
 P 1800 2150
-AR Path="/5CA6B0B3/5D83265A/5DC05279" Ref="C71"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC05279" Ref="C79"  Part="1" 
-F 0 "C79" H 1810 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC05279" Ref="C68"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC05279" Ref="C76"  Part="1" 
+F 0 "C76" H 1810 2220 50  0000 L CNN
 F 1 "0.1 uF" H 1810 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1800 2150 50  0001 C CNN
 F 3 "~" H 1800 2150 50  0001 C CNN
@@ -339,12 +339,12 @@ Connection ~ 2950 2350
 Wire Wire Line
 	2950 2350 2600 2350
 $Comp
-L Device:C_Small C75
+L Device:C_Small C72
 U 1 1 5DC0F871
 P 4750 2150
-AR Path="/5CA6B0B3/5D83265A/5DC0F871" Ref="C75"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC0F871" Ref="C83"  Part="1" 
-F 0 "C83" H 4760 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC0F871" Ref="C72"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC0F871" Ref="C80"  Part="1" 
+F 0 "C80" H 4760 2220 50  0000 L CNN
 F 1 "1 uF" H 4760 2070 50  0000 L CNN
 F 2 "" H 4750 2150 50  0001 C CNN
 F 3 "~" H 4750 2150 50  0001 C CNN
@@ -352,12 +352,12 @@ F 3 "~" H 4750 2150 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C76
+L Device:C_Small C73
 U 1 1 5DC0F877
 P 5100 2150
-AR Path="/5CA6B0B3/5D83265A/5DC0F877" Ref="C76"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC0F877" Ref="C84"  Part="1" 
-F 0 "C84" H 5110 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC0F877" Ref="C73"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC0F877" Ref="C81"  Part="1" 
+F 0 "C81" H 5110 2220 50  0000 L CNN
 F 1 "0.47 uF" H 5110 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5100 2150 50  0001 C CNN
 F 3 "~" H 5100 2150 50  0001 C CNN
@@ -366,12 +366,12 @@ F 4 "963-JMK105BJ474MV-F" H 5100 2150 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C77
+L Device:C_Small C74
 U 1 1 5DC0F87D
 P 5500 2150
-AR Path="/5CA6B0B3/5D83265A/5DC0F87D" Ref="C77"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC0F87D" Ref="C85"  Part="1" 
-F 0 "C85" H 5510 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC0F87D" Ref="C74"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC0F87D" Ref="C82"  Part="1" 
+F 0 "C82" H 5510 2220 50  0000 L CNN
 F 1 "0.1 uF" H 5510 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5500 2150 50  0001 C CNN
 F 3 "~" H 5500 2150 50  0001 C CNN
@@ -380,12 +380,12 @@ F 4 "80-C0402C104M4P" H 5500 2150 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C78
+L Device:C_Small C75
 U 1 1 5DC0F883
 P 5900 2150
-AR Path="/5CA6B0B3/5D83265A/5DC0F883" Ref="C78"  Part="1" 
-AR Path="/5CA6B0B3/5D9A8CAE/5DC0F883" Ref="C86"  Part="1" 
-F 0 "C86" H 5910 2220 50  0000 L CNN
+AR Path="/5CA6B0B3/5D83265A/5DC0F883" Ref="C75"  Part="1" 
+AR Path="/5CA6B0B3/5D9A8CAE/5DC0F883" Ref="C83"  Part="1" 
+F 0 "C83" H 5910 2220 50  0000 L CNN
 F 1 "0.1 uF" H 5910 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5900 2150 50  0001 C CNN
 F 3 "~" H 5900 2150 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/dac.sch-bak b/pcb/discrete/discrete-rf-board/dac.sch-bak
index 7dcb733..250497a 100644
--- a/pcb/discrete/discrete-rf-board/dac.sch-bak
+++ b/pcb/discrete/discrete-rf-board/dac.sch-bak
@@ -88,8 +88,9 @@ AR Path="/5CA6B0B3/5D83265A/5D994F7A" Ref="R45"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D994F7A" Ref="R55"  Part="1" 
 F 0 "R55" V 3450 2800 50  0000 L CNN
 F 1 "15kR 1%" V 3550 2750 50  0000 L CNN
-F 2 "" H 3350 2850 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 2850 50  0001 C CNN
 F 3 "~" H 3350 2850 50  0001 C CNN
+F 4 "71-CRCW080515K0FKEBC" H 3350 2850 50  0001 C CNN "Mouser"
 	1    3350 2850
 	0    -1   1    0   
 $EndComp
@@ -101,8 +102,9 @@ AR Path="/5CA6B0B3/5D83265A/5D996451" Ref="R46"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D996451" Ref="R56"  Part="1" 
 F 0 "R56" V 3450 3100 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3050 50  0000 L CNN
-F 2 "" H 3350 3150 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3150 50  0001 C CNN
 F 3 "~" H 3350 3150 50  0001 C CNN
+F 4 "71-CRCW080515K0FKEBC" H 3350 3150 50  0001 C CNN "Mouser"
 	1    3350 3150
 	0    -1   1    0   
 $EndComp
@@ -114,8 +116,9 @@ AR Path="/5CA6B0B3/5D83265A/5D99666E" Ref="R47"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D99666E" Ref="R57"  Part="1" 
 F 0 "R57" V 3450 3400 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3350 50  0000 L CNN
-F 2 "" H 3350 3450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3450 50  0001 C CNN
 F 3 "~" H 3350 3450 50  0001 C CNN
+F 4 "71-CRCW080515K0FKEBC" H 3350 3450 50  0001 C CNN "Mouser"
 	1    3350 3450
 	0    -1   1    0   
 $EndComp
@@ -127,8 +130,9 @@ AR Path="/5CA6B0B3/5D83265A/5D99690F" Ref="R48"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D99690F" Ref="R58"  Part="1" 
 F 0 "R58" V 3450 3700 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3650 50  0000 L CNN
-F 2 "" H 3350 3750 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3350 3750 50  0001 C CNN
 F 3 "~" H 3350 3750 50  0001 C CNN
+F 4 "71-CRCW080515K0FKEBC" H 3350 3750 50  0001 C CNN "Mouser"
 	1    3350 3750
 	0    -1   1    0   
 $EndComp
@@ -269,8 +273,9 @@ AR Path="/5CA6B0B3/5D83265A/5DC04F33" Ref="C72"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5DC04F33" Ref="C80"  Part="1" 
 F 0 "C80" H 2210 2220 50  0000 L CNN
 F 1 "0.1 uF" H 2210 2070 50  0000 L CNN
-F 2 "" H 2200 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2200 2150 50  0001 C CNN
 F 3 "~" H 2200 2150 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 2200 2150 50  0001 C CNN "Mouser"
 	1    2200 2150
 	1    0    0    -1  
 $EndComp
@@ -282,8 +287,9 @@ AR Path="/5CA6B0B3/5D83265A/5DC05279" Ref="C71"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5DC05279" Ref="C79"  Part="1" 
 F 0 "C79" H 1810 2220 50  0000 L CNN
 F 1 "0.1 uF" H 1810 2070 50  0000 L CNN
-F 2 "" H 1800 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1800 2150 50  0001 C CNN
 F 3 "~" H 1800 2150 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 1800 2150 50  0001 C CNN "Mouser"
 	1    1800 2150
 	1    0    0    -1  
 $EndComp
@@ -367,8 +373,9 @@ AR Path="/5CA6B0B3/5D83265A/5DC0F87D" Ref="C77"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F87D" Ref="C85"  Part="1" 
 F 0 "C85" H 5510 2220 50  0000 L CNN
 F 1 "0.1 uF" H 5510 2070 50  0000 L CNN
-F 2 "" H 5500 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5500 2150 50  0001 C CNN
 F 3 "~" H 5500 2150 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 5500 2150 50  0001 C CNN "Mouser"
 	1    5500 2150
 	-1   0    0    -1  
 $EndComp
@@ -380,8 +387,9 @@ AR Path="/5CA6B0B3/5D83265A/5DC0F883" Ref="C78"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F883" Ref="C86"  Part="1" 
 F 0 "C86" H 5910 2220 50  0000 L CNN
 F 1 "0.1 uF" H 5910 2070 50  0000 L CNN
-F 2 "" H 5900 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5900 2150 50  0001 C CNN
 F 3 "~" H 5900 2150 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 5900 2150 50  0001 C CNN "Mouser"
 	1    5900 2150
 	-1   0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch b/pcb/discrete/discrete-rf-board/diode_mixer.sch
index dc8678a..7ff6f3b 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 19 19
+Sheet 11 19
 Title ""
 Date ""
 Rev ""
@@ -29,12 +29,12 @@ F 4 "726-BAT15099RE6327" H 5900 3200 50  0000 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C205
+L Device:C_Small C207
 U 1 1 5CC1F89D
 P 6500 3600
-AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C205"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C136"  Part="1" 
-F 0 "C205" H 6510 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C207"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C135"  Part="1" 
+F 0 "C207" H 6510 3670 50  0000 L CNN
 F 1 "TBD 0402" H 6510 3520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
@@ -43,12 +43,12 @@ F 4 "791-RF15N1R1B500CT" H 6500 3600 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C206
+L Device:C_Small C208
 U 1 1 5CC20238
 P 7100 3600
-AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C206"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C137"  Part="1" 
-F 0 "C206" H 7110 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C208"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C136"  Part="1" 
+F 0 "C208" H 7110 3670 50  0000 L CNN
 F 1 "TBD 0402" H 7110 3520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7100 3600 50  0001 C CNN
 F 3 "~" H 7100 3600 50  0001 C CNN
@@ -57,12 +57,12 @@ F 4 "791-RF15N1R1B500CT" H 7100 3600 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:L_Small L39
+L Device:L_Small L49
 U 1 1 5CC208EE
 P 6850 3750
-AR Path="/5CA6B0AA/5CC1CC09/5CC208EE" Ref="L39"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC208EE" Ref="L24"  Part="1" 
-F 0 "L39" H 6880 3790 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC208EE" Ref="L49"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC208EE" Ref="L25"  Part="1" 
+F 0 "L49" H 6880 3790 50  0000 L CNN
 F 1 "TBD 0402" H 6880 3710 50  0000 L CNN
 F 2 "" H 6850 3750 50  0001 C CNN
 F 3 "~" H 6850 3750 50  0001 C CNN
@@ -70,12 +70,12 @@ F 3 "~" H 6850 3750 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:L_Small L38
+L Device:L_Small L48
 U 1 1 5CC2101C
 P 6850 3450
-AR Path="/5CA6B0AA/5CC1CC09/5CC2101C" Ref="L38"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC2101C" Ref="L23"  Part="1" 
-F 0 "L38" H 6880 3490 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC2101C" Ref="L48"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC2101C" Ref="L24"  Part="1" 
+F 0 "L48" H 6880 3490 50  0000 L CNN
 F 1 "TBD 0402" H 6880 3410 50  0000 L CNN
 F 2 "" H 6850 3450 50  0001 C CNN
 F 3 "~" H 6850 3450 50  0001 C CNN
@@ -103,12 +103,12 @@ Wire Wire Line
 Wire Wire Line
 	3300 3600 3400 3600
 $Comp
-L Device:L_Small L40
+L Device:L_Small L50
 U 1 1 5CC289D9
 P 8300 4100
-AR Path="/5CA6B0AA/5CC1CC09/5CC289D9" Ref="L40"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC289D9" Ref="L25"  Part="1" 
-F 0 "L40" H 8330 4140 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC289D9" Ref="L50"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC289D9" Ref="L26"  Part="1" 
+F 0 "L50" H 8330 4140 50  0000 L CNN
 F 1 "220 nH" H 8330 4060 50  0000 L CNN
 F 2 "" H 8300 4100 50  0001 C CNN
 F 3 "~" H 8300 4100 50  0001 C CNN
@@ -120,12 +120,12 @@ Wire Wire Line
 Wire Wire Line
 	8300 3600 8300 4000
 $Comp
-L Device:R_Small R157
+L Device:R_Small R164
 U 1 1 5CC29B4E
 P 8300 4450
-AR Path="/5CA6B0AA/5CC1CC09/5CC29B4E" Ref="R157"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC29B4E" Ref="R113"  Part="1" 
-F 0 "R157" H 8330 4470 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC29B4E" Ref="R164"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC29B4E" Ref="R117"  Part="1" 
+F 0 "R164" H 8330 4470 50  0000 L CNN
 F 1 "200R" H 8330 4410 50  0000 L CNN
 F 2 "" H 8300 4450 50  0001 C CNN
 F 3 "~" H 8300 4450 50  0001 C CNN
@@ -133,12 +133,12 @@ F 3 "~" H 8300 4450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R158
+L Device:R_Small R165
 U 1 1 5CC29F9D
 P 8550 4300
-AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R158"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R114"  Part="1" 
-F 0 "R158" H 8580 4320 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R165"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R118"  Part="1" 
+F 0 "R165" H 8580 4320 50  0000 L CNN
 F 1 "100R" H 8580 4260 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 8550 4300 50  0001 C CNN
 F 3 "~" H 8550 4300 50  0001 C CNN
@@ -147,12 +147,12 @@ F 4 " 667-ERJ-U02D1000X " H 8550 4300 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:C_Small C208
+L Device:C_Small C210
 U 1 1 5CC2B0AC
 P 8750 4450
-AR Path="/5CA6B0AA/5CC1CC09/5CC2B0AC" Ref="C208"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC2B0AC" Ref="C139"  Part="1" 
-F 0 "C208" H 8760 4520 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC2B0AC" Ref="C210"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC2B0AC" Ref="C138"  Part="1" 
+F 0 "C210" H 8760 4520 50  0000 L CNN
 F 1 "47 pF" H 8760 4370 50  0000 L CNN
 F 2 "" H 8750 4450 50  0001 C CNN
 F 3 "~" H 8750 4450 50  0001 C CNN
@@ -175,7 +175,7 @@ L power:GND #PWR0257
 U 1 1 5CC2FA5E
 P 2750 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC2FA5E" Ref="#PWR0257"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC2FA5E" Ref="#PWR0169"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC2FA5E" Ref="#PWR0166"  Part="1" 
 F 0 "#PWR0257" H 2750 3700 50  0001 C CNN
 F 1 "GND" H 2750 3800 50  0000 C CNN
 F 2 "" H 2750 3950 50  0001 C CNN
@@ -188,7 +188,7 @@ L power:GND #PWR0258
 U 1 1 5CC3011D
 P 9150 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC3011D" Ref="#PWR0258"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC3011D" Ref="#PWR0170"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC3011D" Ref="#PWR0167"  Part="1" 
 F 0 "#PWR0258" H 9150 3700 50  0001 C CNN
 F 1 "GND" H 9150 3800 50  0000 C CNN
 F 2 "" H 9150 3950 50  0001 C CNN
@@ -229,7 +229,7 @@ L power:GND #PWR0259
 U 1 1 5CC33186
 P 9600 3250
 AR Path="/5CA6B0AA/5CC1CC09/5CC33186" Ref="#PWR0259"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC33186" Ref="#PWR0171"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC33186" Ref="#PWR0168"  Part="1" 
 F 0 "#PWR0259" H 9600 3000 50  0001 C CNN
 F 1 "GND" H 9600 3100 50  0000 C CNN
 F 2 "" H 9600 3250 50  0001 C CNN
@@ -242,7 +242,7 @@ L power:GND #PWR0256
 U 1 1 5CC33A73
 P 2450 3200
 AR Path="/5CA6B0AA/5CC1CC09/5CC33A73" Ref="#PWR0256"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC33A73" Ref="#PWR0168"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC33A73" Ref="#PWR0165"  Part="1" 
 F 0 "#PWR0256" H 2450 2950 50  0001 C CNN
 F 1 "GND" H 2450 3050 50  0000 C CNN
 F 2 "" H 2450 3200 50  0001 C CNN
@@ -289,12 +289,12 @@ Wire Wire Line
 Wire Wire Line
 	3400 3600 3400 4950
 $Comp
-L Device:L_Small L41
+L Device:L_Small L51
 U 1 1 5CC5AE0B
 P 8300 4750
-AR Path="/5CA6B0AA/5CC1CC09/5CC5AE0B" Ref="L41"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC5AE0B" Ref="L26"  Part="1" 
-F 0 "L41" H 8330 4790 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC5AE0B" Ref="L51"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC5AE0B" Ref="L27"  Part="1" 
+F 0 "L51" H 8330 4790 50  0000 L CNN
 F 1 "220 nH" H 8330 4710 50  0000 L CNN
 F 2 "" H 8300 4750 50  0001 C CNN
 F 3 "~" H 8300 4750 50  0001 C CNN
@@ -306,12 +306,12 @@ Wire Wire Line
 Wire Wire Line
 	8300 4650 8300 4600
 $Comp
-L Device:R_Small R159
+L Device:R_Small R166
 U 1 1 5CC5DD55
 P 8550 4600
-AR Path="/5CA6B0AA/5CC1CC09/5CC5DD55" Ref="R159"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC5DD55" Ref="R115"  Part="1" 
-F 0 "R159" H 8580 4620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC5DD55" Ref="R166"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC5DD55" Ref="R119"  Part="1" 
+F 0 "R166" H 8580 4620 50  0000 L CNN
 F 1 "100R" H 8580 4560 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 8550 4600 50  0001 C CNN
 F 3 "~" H 8550 4600 50  0001 C CNN
@@ -344,12 +344,12 @@ Wire Wire Line
 Wire Wire Line
 	5100 3750 5200 3750
 $Comp
-L Device:L_Small L37
+L Device:L_Small L47
 U 1 1 5CC22010
 P 5000 3750
-AR Path="/5CA6B0AA/5CC1CC09/5CC22010" Ref="L37"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC22010" Ref="L22"  Part="1" 
-F 0 "L37" H 5030 3790 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC22010" Ref="L47"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC22010" Ref="L23"  Part="1" 
+F 0 "L47" H 5030 3790 50  0000 L CNN
 F 1 "TBD 0402" H 5030 3710 50  0000 L CNN
 F 2 "" H 5000 3750 50  0001 C CNN
 F 3 "~" H 5000 3750 50  0001 C CNN
@@ -357,12 +357,12 @@ F 3 "~" H 5000 3750 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:C_Small C203
+L Device:C_Small C205
 U 1 1 5CC1F7BA
 P 4750 3600
-AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C203"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C134"  Part="1" 
-F 0 "C203" H 4760 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C205"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C133"  Part="1" 
+F 0 "C205" H 4760 3670 50  0000 L CNN
 F 1 "TBD 0402" H 4760 3520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4750 3600 50  0001 C CNN
 F 3 "~" H 4750 3600 50  0001 C CNN
@@ -388,12 +388,12 @@ Wire Wire Line
 Wire Wire Line
 	5200 3750 5450 3750
 $Comp
-L Device:C_Small C202
+L Device:C_Small C204
 U 1 1 5D51EF09
 P 4150 3600
-AR Path="/5CA6B0AA/5CC1CC09/5D51EF09" Ref="C202"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D51EF09" Ref="C133"  Part="1" 
-F 0 "C202" H 4160 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D51EF09" Ref="C204"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D51EF09" Ref="C132"  Part="1" 
+F 0 "C204" H 4160 3670 50  0000 L CNN
 F 1 "DNP" H 4160 3520 50  0000 L CNN
 F 2 "" H 4150 3600 50  0001 C CNN
 F 3 "~" H 4150 3600 50  0001 C CNN
@@ -401,12 +401,12 @@ F 3 "~" H 4150 3600 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R153
+L Device:R_Small R160
 U 1 1 5D51FC82
 P 4400 3450
-AR Path="/5CA6B0AA/5CC1CC09/5D51FC82" Ref="R153"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D51FC82" Ref="R109"  Part="1" 
-F 0 "R153" H 4430 3470 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D51FC82" Ref="R160"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D51FC82" Ref="R113"  Part="1" 
+F 0 "R160" H 4430 3470 50  0000 L CNN
 F 1 "0R" H 4430 3410 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4400 3450 50  0001 C CNN
 F 3 "~" H 4400 3450 50  0001 C CNN
@@ -415,12 +415,12 @@ F 4 "71-CRCW04020000Z0EDC" H 4400 3450 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R154
+L Device:R_Small R161
 U 1 1 5D5221DB
 P 4400 3750
-AR Path="/5CA6B0AA/5CC1CC09/5D5221DB" Ref="R154"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D5221DB" Ref="R110"  Part="1" 
-F 0 "R154" H 4430 3770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D5221DB" Ref="R161"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D5221DB" Ref="R114"  Part="1" 
+F 0 "R161" H 4430 3770 50  0000 L CNN
 F 1 "0R" H 4430 3710 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4400 3750 50  0001 C CNN
 F 3 "~" H 4400 3750 50  0001 C CNN
@@ -437,12 +437,12 @@ Wire Wire Line
 Wire Wire Line
 	4150 3750 4300 3750
 $Comp
-L Device:C_Small C207
+L Device:C_Small C209
 U 1 1 5D52D7BD
 P 7750 3600
-AR Path="/5CA6B0AA/5CC1CC09/5D52D7BD" Ref="C207"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D52D7BD" Ref="C138"  Part="1" 
-F 0 "C207" H 7760 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D52D7BD" Ref="C209"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D52D7BD" Ref="C137"  Part="1" 
+F 0 "C209" H 7760 3670 50  0000 L CNN
 F 1 "DNP" H 7760 3520 50  0000 L CNN
 F 2 "" H 7750 3600 50  0001 C CNN
 F 3 "~" H 7750 3600 50  0001 C CNN
@@ -450,12 +450,12 @@ F 3 "~" H 7750 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R155
+L Device:R_Small R162
 U 1 1 5D52D7C3
 P 7500 3450
-AR Path="/5CA6B0AA/5CC1CC09/5D52D7C3" Ref="R155"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D52D7C3" Ref="R111"  Part="1" 
-F 0 "R155" H 7530 3470 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D52D7C3" Ref="R162"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D52D7C3" Ref="R115"  Part="1" 
+F 0 "R162" H 7530 3470 50  0000 L CNN
 F 1 "0R" H 7530 3410 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7500 3450 50  0001 C CNN
 F 3 "~" H 7500 3450 50  0001 C CNN
@@ -464,12 +464,12 @@ F 4 "71-CRCW04020000Z0EDC" H 7500 3450 50  0001 C CNN "Mouser"
 	0    1    -1   0   
 $EndComp
 $Comp
-L Device:R_Small R156
+L Device:R_Small R163
 U 1 1 5D52D7C9
 P 7500 3750
-AR Path="/5CA6B0AA/5CC1CC09/5D52D7C9" Ref="R156"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D52D7C9" Ref="R112"  Part="1" 
-F 0 "R156" H 7530 3770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D52D7C9" Ref="R163"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D52D7C9" Ref="R116"  Part="1" 
+F 0 "R163" H 7530 3770 50  0000 L CNN
 F 1 "0R" H 7530 3710 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7500 3750 50  0001 C CNN
 F 3 "~" H 7500 3750 50  0001 C CNN
@@ -600,12 +600,12 @@ Connection ~ 5450 3750
 Wire Wire Line
 	5450 3750 5550 3750
 $Comp
-L Device:R_Small R160
+L Device:R_Small R167
 U 1 1 5D979A64
 P 9500 4450
-AR Path="/5CA6B0AA/5CC1CC09/5D979A64" Ref="R160"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5D979A64" Ref="R116"  Part="1" 
-F 0 "R160" H 9530 4470 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5D979A64" Ref="R167"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5D979A64" Ref="R120"  Part="1" 
+F 0 "R167" H 9530 4470 50  0000 L CNN
 F 1 "DNP 0402" H 9530 4410 50  0000 L CNN
 F 2 "" H 9500 4450 50  0001 C CNN
 F 3 "~" H 9500 4450 50  0001 C CNN
@@ -625,12 +625,12 @@ Connection ~ 9500 4600
 Wire Wire Line
 	9500 4600 9250 4600
 $Comp
-L Device:C_Small C140
+L Device:C_Small C139
 U 1 1 5DDA2DE4
 P 9150 4300
-AR Path="/5CA6B0AA/5CC4015A/5DDA2DE4" Ref="C140"  Part="1" 
-AR Path="/5CA6B0AA/5CC1CC09/5DDA2DE4" Ref="C209"  Part="1" 
-F 0 "C209" H 9160 4370 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4015A/5DDA2DE4" Ref="C139"  Part="1" 
+AR Path="/5CA6B0AA/5CC1CC09/5DDA2DE4" Ref="C211"  Part="1" 
+F 0 "C211" H 9160 4370 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4220 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 4300 50  0001 C CNN
 F 3 "~" H 9150 4300 50  0001 C CNN
@@ -639,12 +639,12 @@ F 4 "80-C0402C104M4P" H 9150 4300 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:C_Small C141
+L Device:C_Small C140
 U 1 1 5DDA597D
 P 9150 4600
-AR Path="/5CA6B0AA/5CC4015A/5DDA597D" Ref="C141"  Part="1" 
-AR Path="/5CA6B0AA/5CC1CC09/5DDA597D" Ref="C210"  Part="1" 
-F 0 "C210" H 9160 4670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4015A/5DDA597D" Ref="C140"  Part="1" 
+AR Path="/5CA6B0AA/5CC1CC09/5DDA597D" Ref="C212"  Part="1" 
+F 0 "C212" H 9160 4670 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 4600 50  0001 C CNN
 F 3 "~" H 9150 4600 50  0001 C CNN
@@ -659,12 +659,12 @@ Wire Wire Line
 	8750 4600 9050 4600
 Connection ~ 8750 4600
 $Comp
-L Device:L_Small L36
+L Device:L_Small L46
 U 1 1 5CC22016
 P 5000 3450
-AR Path="/5CA6B0AA/5CC1CC09/5CC22016" Ref="L36"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC22016" Ref="L21"  Part="1" 
-F 0 "L36" H 5030 3490 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC22016" Ref="L46"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC22016" Ref="L22"  Part="1" 
+F 0 "L46" H 5030 3490 50  0000 L CNN
 F 1 "TBD 0402" H 5030 3410 50  0000 L CNN
 F 2 "" H 5000 3450 50  0001 C CNN
 F 3 "~" H 5000 3450 50  0001 C CNN
@@ -672,12 +672,12 @@ F 3 "~" H 5000 3450 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:C_Small C204
+L Device:C_Small C206
 U 1 1 5CC1E94D
 P 5200 3600
-AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C204"  Part="1" 
-AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C135"  Part="1" 
-F 0 "C204" H 5210 3670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C206"  Part="1" 
+AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C134"  Part="1" 
+F 0 "C206" H 5210 3670 50  0000 L CNN
 F 1 "TBD 0402" H 5210 3520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5200 3600 50  0001 C CNN
 F 3 "~" H 5200 3600 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
index 2cd2626..dc8678a 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
@@ -50,8 +50,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C206"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C137"  Part="1" 
 F 0 "C206" H 7110 3670 50  0000 L CNN
 F 1 "TBD 0402" H 7110 3520 50  0000 L CNN
-F 2 "" H 7100 3600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 7100 3600 50  0001 C CNN
 F 3 "~" H 7100 3600 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 7100 3600 50  0001 C CNN "Mouser"
 	1    7100 3600
 	1    0    0    -1  
 $EndComp
@@ -139,8 +140,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R158"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R114"  Part="1" 
 F 0 "R158" H 8580 4320 50  0000 L CNN
 F 1 "100R" H 8580 4260 50  0000 L CNN
-F 2 "" H 8550 4300 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 8550 4300 50  0001 C CNN
 F 3 "~" H 8550 4300 50  0001 C CNN
+F 4 " 667-ERJ-U02D1000X " H 8550 4300 50  0001 C CNN "Mouser"
 	1    8550 4300
 	0    -1   1    0   
 $EndComp
@@ -362,8 +364,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C203"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C134"  Part="1" 
 F 0 "C203" H 4760 3670 50  0000 L CNN
 F 1 "TBD 0402" H 4760 3520 50  0000 L CNN
-F 2 "" H 4750 3600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4750 3600 50  0001 C CNN
 F 3 "~" H 4750 3600 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 4750 3600 50  0001 C CNN "Mouser"
 	1    4750 3600
 	-1   0    0    -1  
 $EndComp
@@ -629,8 +632,9 @@ AR Path="/5CA6B0AA/5CC4015A/5DDA2DE4" Ref="C140"  Part="1"
 AR Path="/5CA6B0AA/5CC1CC09/5DDA2DE4" Ref="C209"  Part="1" 
 F 0 "C209" H 9160 4370 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4220 50  0000 L CNN
-F 2 "" H 9150 4300 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 4300 50  0001 C CNN
 F 3 "~" H 9150 4300 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 9150 4300 50  0001 C CNN "Mouser"
 	1    9150 4300
 	0    -1   1    0   
 $EndComp
@@ -642,8 +646,9 @@ AR Path="/5CA6B0AA/5CC4015A/5DDA597D" Ref="C141"  Part="1"
 AR Path="/5CA6B0AA/5CC1CC09/5DDA597D" Ref="C210"  Part="1" 
 F 0 "C210" H 9160 4670 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4520 50  0000 L CNN
-F 2 "" H 9150 4600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 4600 50  0001 C CNN
 F 3 "~" H 9150 4600 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 9150 4600 50  0001 C CNN "Mouser"
 	1    9150 4600
 	0    -1   1    0   
 $EndComp
@@ -674,8 +679,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C204"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C135"  Part="1" 
 F 0 "C204" H 5210 3670 50  0000 L CNN
 F 1 "TBD 0402" H 5210 3520 50  0000 L CNN
-F 2 "" H 5200 3600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5200 3600 50  0001 C CNN
 F 3 "~" H 5200 3600 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 5200 3600 50  0001 C CNN "Mouser"
 	1    5200 3600
 	-1   0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
index d4f5231..3d2e591 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
@@ -74,10 +74,10 @@ F9 "5V0" I L 1800 2950 50
 F10 "PLL_GND" I L 1800 4150 50 
 $EndSheet
 $Comp
-L power:GND #PWR011
+L power:GND #PWR09
 U 1 1 5CC42654
 P 8300 4000
-F 0 "#PWR011" H 8300 3750 50  0001 C CNN
+F 0 "#PWR09" H 8300 3750 50  0001 C CNN
 F 1 "GND" H 8300 3850 50  0000 C CNN
 F 2 "" H 8300 4000 50  0001 C CNN
 F 3 "" H 8300 4000 50  0001 C CNN
@@ -111,10 +111,10 @@ F 4 " 530-142-0701-801 " H 10150 3250 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR019
+L power:GND #PWR015
 U 1 1 5CC454AB
 P 10150 3550
-F 0 "#PWR019" H 10150 3300 50  0001 C CNN
+F 0 "#PWR015" H 10150 3300 50  0001 C CNN
 F 1 "GND" H 10150 3400 50  0000 C CNN
 F 2 "" H 10150 3550 50  0001 C CNN
 F 3 "" H 10150 3550 50  0001 C CNN
@@ -126,10 +126,10 @@ Wire Wire Line
 Wire Wire Line
 	3600 3350 3850 3350
 $Comp
-L power:GND #PWR07
+L power:GND #PWR05
 U 1 1 5D0A60D6
 P 4350 4100
-F 0 "#PWR07" H 4350 3850 50  0001 C CNN
+F 0 "#PWR05" H 4350 3850 50  0001 C CNN
 F 1 "GND" H 4355 3927 50  0000 C CNN
 F 2 "" H 4350 4100 50  0001 C CNN
 F 3 "" H 4350 4100 50  0001 C CNN
@@ -137,10 +137,10 @@ F 3 "" H 4350 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C9
+L Device:C_Small C7
 U 1 1 5D876EA7
 P 9550 3500
-F 0 "C9" H 9560 3570 50  0000 L CNN
+F 0 "C7" H 9560 3570 50  0000 L CNN
 F 1 "30 pF" H 9560 3420 50  0000 L CNN
 F 2 "" H 9550 3500 50  0001 C CNN
 F 3 "~" H 9550 3500 50  0001 C CNN
@@ -166,10 +166,10 @@ Wire Wire Line
 Wire Wire Line
 	9400 3250 9550 3250
 $Comp
-L power:GND #PWR016
+L power:GND #PWR014
 U 1 1 5D879336
 P 9550 3700
-F 0 "#PWR016" H 9550 3450 50  0001 C CNN
+F 0 "#PWR014" H 9550 3450 50  0001 C CNN
 F 1 "GND" H 9550 3550 50  0000 C CNN
 F 2 "" H 9550 3700 50  0001 C CNN
 F 3 "" H 9550 3700 50  0001 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 9550 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR014
+L power:GND #PWR012
 U 1 1 5D8796B9
 P 9400 3700
-F 0 "#PWR014" H 9400 3450 50  0001 C CNN
+F 0 "#PWR012" H 9400 3450 50  0001 C CNN
 F 1 "GND" H 9400 3550 50  0000 C CNN
 F 2 "" H 9400 3700 50  0001 C CNN
 F 3 "" H 9400 3700 50  0001 C CNN
@@ -244,10 +244,10 @@ F 4 " 571-2337019-1" H 7700 2550 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR09
+L power:GND #PWR07
 U 1 1 5D8978C1
 P 7700 2900
-F 0 "#PWR09" H 7700 2650 50  0001 C CNN
+F 0 "#PWR07" H 7700 2650 50  0001 C CNN
 F 1 "GND" H 7700 2750 50  0000 C CNN
 F 2 "" H 7700 2900 50  0001 C CNN
 F 3 "" H 7700 2900 50  0001 C CNN
@@ -296,10 +296,10 @@ Wire Wire Line
 	7300 3350 7400 3350
 Connection ~ 7400 3350
 $Comp
-L power:GND #PWR08
+L power:GND #PWR06
 U 1 1 5D989BE4
 P 6750 3350
-F 0 "#PWR08" H 6750 3100 50  0001 C CNN
+F 0 "#PWR06" H 6750 3100 50  0001 C CNN
 F 1 "GND" H 6750 3200 50  0000 C CNN
 F 2 "" H 6750 3350 50  0001 C CNN
 F 3 "" H 6750 3350 50  0001 C CNN
@@ -352,13 +352,13 @@ Wire Wire Line
 	3750 3550 3850 3550
 Wire Wire Line
 	9000 3450 8800 3450
-Text Label 2550 1900 0    50   ~ 0
+Text Label 3150 1900 0    50   ~ 0
 LO_SW_VDD_5V
 $Comp
-L Device:C_Small C4
+L Device:C_Small C2
 U 1 1 5DC64548
 P 3600 2100
-F 0 "C4" H 3610 2170 50  0000 L CNN
+F 0 "C2" H 3610 2170 50  0000 L CNN
 F 1 "1 nF" H 3610 2020 50  0000 L CNN
 F 2 "" H 3600 2100 50  0001 C CNN
 F 3 "~" H 3600 2100 50  0001 C CNN
@@ -366,10 +366,10 @@ F 3 "~" H 3600 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C5
+L Device:C_Small C3
 U 1 1 5DC6475D
 P 4000 2100
-F 0 "C5" H 4010 2170 50  0000 L CNN
+F 0 "C3" H 4010 2170 50  0000 L CNN
 F 1 "0.01 uF" H 4010 2020 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4000 2100 50  0001 C CNN
 F 3 "~" H 4000 2100 50  0001 C CNN
@@ -377,40 +377,8 @@ F 4 "80-C0402C103K4R7411" H 4000 2100 50  0001 C CNN "Mouser"
 	1    4000 2100
 	1    0    0    -1  
 $EndComp
-$Comp
-L Device:C_Small C3
-U 1 1 5DC64A2E
-P 3250 2100
-F 0 "C3" H 3260 2170 50  0000 L CNN
-F 1 "470 pF" H 3260 2020 50  0000 L CNN
-F 2 "" H 3250 2100 50  0001 C CNN
-F 3 "~" H 3250 2100 50  0001 C CNN
-	1    3250 2100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C2
-U 1 1 5DC64E2F
-P 2900 2100
-F 0 "C2" H 2910 2170 50  0000 L CNN
-F 1 "100 pF" H 2910 2020 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2900 2100 50  0001 C CNN
-F 3 "~" H 2900 2100 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 2900 2100 50  0001 C CNN "Mouser"
-	1    2900 2100
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	4350 1900 4350 2950
-Wire Wire Line
-	2900 2000 2900 1900
-Wire Wire Line
-	2900 1900 3250 1900
-Wire Wire Line
-	3250 2000 3250 1900
-Connection ~ 3250 1900
-Wire Wire Line
-	3250 1900 3600 1900
 Wire Wire Line
 	3600 2000 3600 1900
 Connection ~ 3600 1900
@@ -422,10 +390,10 @@ Connection ~ 4000 1900
 Wire Wire Line
 	4000 1900 4350 1900
 $Comp
-L power:GND #PWR06
+L power:GND #PWR04
 U 1 1 5DC6DF37
 P 4000 2300
-F 0 "#PWR06" H 4000 2050 50  0001 C CNN
+F 0 "#PWR04" H 4000 2050 50  0001 C CNN
 F 1 "GND" H 4000 2150 50  0000 C CNN
 F 2 "" H 4000 2300 50  0001 C CNN
 F 3 "" H 4000 2300 50  0001 C CNN
@@ -433,10 +401,10 @@ F 3 "" H 4000 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR05
+L power:GND #PWR03
 U 1 1 5DC6E07A
 P 3600 2300
-F 0 "#PWR05" H 3600 2050 50  0001 C CNN
+F 0 "#PWR03" H 3600 2050 50  0001 C CNN
 F 1 "GND" H 3600 2150 50  0000 C CNN
 F 2 "" H 3600 2300 50  0001 C CNN
 F 3 "" H 3600 2300 50  0001 C CNN
@@ -444,69 +412,41 @@ F 3 "" H 3600 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR04
-U 1 1 5DC6E2AA
-P 3250 2300
-F 0 "#PWR04" H 3250 2050 50  0001 C CNN
-F 1 "GND" H 3250 2150 50  0000 C CNN
-F 2 "" H 3250 2300 50  0001 C CNN
-F 3 "" H 3250 2300 50  0001 C CNN
-	1    3250 2300
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR03
-U 1 1 5DC6E488
-P 2900 2300
-F 0 "#PWR03" H 2900 2050 50  0001 C CNN
-F 1 "GND" H 2900 2150 50  0000 C CNN
-F 2 "" H 2900 2300 50  0001 C CNN
-F 3 "" H 2900 2300 50  0001 C CNN
-	1    2900 2300
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:C_Small C1
 U 1 1 5DC6EF88
-P 2550 2100
-F 0 "C1" H 2560 2170 50  0000 L CNN
-F 1 "100 pF" H 2560 2020 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2550 2100 50  0001 C CNN
-F 3 "~" H 2550 2100 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 2550 2100 50  0001 C CNN "Mouser"
-	1    2550 2100
+P 3150 2100
+F 0 "C1" H 3160 2170 50  0000 L CNN
+F 1 "100 pF" H 3160 2020 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3150 2100 50  0001 C CNN
+F 3 "~" H 3150 2100 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 3150 2100 50  0001 C CNN "Mouser"
+	1    3150 2100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2550 2000 2550 1900
-Wire Wire Line
-	2550 1900 2900 1900
+	3150 2000 3150 1900
 $Comp
 L power:GND #PWR02
 U 1 1 5DC6FAEE
-P 2550 2300
-F 0 "#PWR02" H 2550 2050 50  0001 C CNN
-F 1 "GND" H 2550 2150 50  0000 C CNN
-F 2 "" H 2550 2300 50  0001 C CNN
-F 3 "" H 2550 2300 50  0001 C CNN
-	1    2550 2300
+P 3150 2300
+F 0 "#PWR02" H 3150 2050 50  0001 C CNN
+F 1 "GND" H 3150 2150 50  0000 C CNN
+F 2 "" H 3150 2300 50  0001 C CNN
+F 3 "" H 3150 2300 50  0001 C CNN
+	1    3150 2300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2550 2200 2550 2300
-Wire Wire Line
-	2900 2300 2900 2200
-Wire Wire Line
-	3250 2200 3250 2300
+	3150 2200 3150 2300
 Wire Wire Line
 	3600 2300 3600 2200
 Wire Wire Line
 	4000 2300 4000 2200
 $Comp
-L Device:C_Small C7
+L Device:C_Small C5
 U 1 1 5DC7874D
 P 9100 2300
-F 0 "C7" H 9110 2370 50  0000 L CNN
+F 0 "C5" H 9110 2370 50  0000 L CNN
 F 1 "1 nF" H 9110 2220 50  0000 L CNN
 F 2 "" H 9100 2300 50  0001 C CNN
 F 3 "~" H 9100 2300 50  0001 C CNN
@@ -514,10 +454,10 @@ F 3 "~" H 9100 2300 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C6
+L Device:C_Small C4
 U 1 1 5DC78753
 P 8700 2300
-F 0 "C6" H 8710 2370 50  0000 L CNN
+F 0 "C4" H 8710 2370 50  0000 L CNN
 F 1 "0.01 uF" H 8710 2220 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8700 2300 50  0001 C CNN
 F 3 "~" H 8700 2300 50  0001 C CNN
@@ -526,37 +466,19 @@ F 4 "80-C0402C103K4R7411" H 8700 2300 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C8
-U 1 1 5DC78759
-P 9450 2300
-F 0 "C8" H 9460 2370 50  0000 L CNN
-F 1 "470 pF" H 9460 2220 50  0000 L CNN
-F 2 "" H 9450 2300 50  0001 C CNN
-F 3 "~" H 9450 2300 50  0001 C CNN
-	1    9450 2300
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C10
+L Device:C_Small C6
 U 1 1 5DC7875F
-P 9800 2300
-F 0 "C10" H 9810 2370 50  0000 L CNN
-F 1 "100 pF" H 9810 2220 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 9800 2300 50  0001 C CNN
-F 3 "~" H 9800 2300 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 9800 2300 50  0001 C CNN "Mouser"
-	1    9800 2300
+P 9500 2300
+F 0 "C6" H 9510 2370 50  0000 L CNN
+F 1 "100 pF" H 9510 2220 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9500 2300 50  0001 C CNN
+F 3 "~" H 9500 2300 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 9500 2300 50  0001 C CNN "Mouser"
+	1    9500 2300
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	9800 2200 9800 2100
-Wire Wire Line
-	9800 2100 9450 2100
-Wire Wire Line
-	9450 2200 9450 2100
-Connection ~ 9450 2100
-Wire Wire Line
-	9450 2100 9100 2100
+	9500 2200 9500 2100
 Wire Wire Line
 	9100 2200 9100 2100
 Connection ~ 9100 2100
@@ -566,10 +488,10 @@ Wire Wire Line
 	8700 2200 8700 2100
 Connection ~ 8700 2100
 $Comp
-L power:GND #PWR012
+L power:GND #PWR010
 U 1 1 5DC78770
 P 8700 2500
-F 0 "#PWR012" H 8700 2250 50  0001 C CNN
+F 0 "#PWR010" H 8700 2250 50  0001 C CNN
 F 1 "GND" H 8700 2350 50  0000 C CNN
 F 2 "" H 8700 2500 50  0001 C CNN
 F 3 "" H 8700 2500 50  0001 C CNN
@@ -577,10 +499,10 @@ F 3 "" H 8700 2500 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR013
+L power:GND #PWR011
 U 1 1 5DC78776
 P 9100 2500
-F 0 "#PWR013" H 9100 2250 50  0001 C CNN
+F 0 "#PWR011" H 9100 2250 50  0001 C CNN
 F 1 "GND" H 9100 2350 50  0000 C CNN
 F 2 "" H 9100 2500 50  0001 C CNN
 F 3 "" H 9100 2500 50  0001 C CNN
@@ -588,65 +510,22 @@ F 3 "" H 9100 2500 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR015
-U 1 1 5DC7877C
-P 9450 2500
-F 0 "#PWR015" H 9450 2250 50  0001 C CNN
-F 1 "GND" H 9450 2350 50  0000 C CNN
-F 2 "" H 9450 2500 50  0001 C CNN
-F 3 "" H 9450 2500 50  0001 C CNN
-	1    9450 2500
-	-1   0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR017
+L power:GND #PWR013
 U 1 1 5DC78782
-P 9800 2500
-F 0 "#PWR017" H 9800 2250 50  0001 C CNN
-F 1 "GND" H 9800 2350 50  0000 C CNN
-F 2 "" H 9800 2500 50  0001 C CNN
-F 3 "" H 9800 2500 50  0001 C CNN
-	1    9800 2500
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C11
-U 1 1 5DC78788
-P 10150 2300
-F 0 "C11" H 10160 2370 50  0000 L CNN
-F 1 "100 pF" H 10160 2220 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 10150 2300 50  0001 C CNN
-F 3 "~" H 10150 2300 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 10150 2300 50  0001 C CNN "Mouser"
-	1    10150 2300
+P 9500 2500
+F 0 "#PWR013" H 9500 2250 50  0001 C CNN
+F 1 "GND" H 9500 2350 50  0000 C CNN
+F 2 "" H 9500 2500 50  0001 C CNN
+F 3 "" H 9500 2500 50  0001 C CNN
+	1    9500 2500
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	10150 2200 10150 2100
-Wire Wire Line
-	10150 2100 9800 2100
-$Comp
-L power:GND #PWR018
-U 1 1 5DC78790
-P 10150 2500
-F 0 "#PWR018" H 10150 2250 50  0001 C CNN
-F 1 "GND" H 10150 2350 50  0000 C CNN
-F 2 "" H 10150 2500 50  0001 C CNN
-F 3 "" H 10150 2500 50  0001 C CNN
-	1    10150 2500
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	10150 2400 10150 2500
-Wire Wire Line
-	9800 2500 9800 2400
-Wire Wire Line
-	9450 2400 9450 2500
+	9500 2500 9500 2400
 Wire Wire Line
 	9100 2500 9100 2400
 Wire Wire Line
 	8700 2500 8700 2400
-Connection ~ 9800 2100
 Wire Wire Line
 	8300 2850 8300 2100
 Wire Wire Line
@@ -1170,10 +1049,10 @@ Wire Wire Line
 Text Label 8300 1850 0    50   ~ 0
 RF_SW_GND
 $Comp
-L power:GND #PWR010
+L power:GND #PWR08
 U 1 1 5DB60E45
 P 8200 1850
-F 0 "#PWR010" H 8200 1600 50  0001 C CNN
+F 0 "#PWR08" H 8200 1600 50  0001 C CNN
 F 1 "GND" H 8200 1700 50  0000 C CNN
 F 2 "" H 8200 1850 50  0001 C CNN
 F 3 "" H 8200 1850 50  0001 C CNN
@@ -1239,4 +1118,8 @@ Wire Wire Line
 	2300 4800 2450 4800
 Wire Wire Line
 	1150 5350 1250 5350
+Wire Wire Line
+	9100 2100 9500 2100
+Wire Wire Line
+	3150 1900 3600 1900
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
index fb75743..dcf9b28 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
@@ -352,7 +352,7 @@ Wire Wire Line
 	3750 3550 3850 3550
 Wire Wire Line
 	9000 3450 8800 3450
-Text Label 2550 1900 0    50   ~ 0
+Text Label 3150 1900 0    50   ~ 0
 LO_SW_VDD_5V
 $Comp
 L Device:C_Small C4
@@ -377,40 +377,8 @@ F 4 "80-C0402C103K4R7411" H 4000 2100 50  0001 C CNN "Mouser"
 	1    4000 2100
 	1    0    0    -1  
 $EndComp
-$Comp
-L Device:C_Small C3
-U 1 1 5DC64A2E
-P 3250 2100
-F 0 "C3" H 3260 2170 50  0000 L CNN
-F 1 "470 pF" H 3260 2020 50  0000 L CNN
-F 2 "" H 3250 2100 50  0001 C CNN
-F 3 "~" H 3250 2100 50  0001 C CNN
-	1    3250 2100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C2
-U 1 1 5DC64E2F
-P 2900 2100
-F 0 "C2" H 2910 2170 50  0000 L CNN
-F 1 "100 pF" H 2910 2020 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2900 2100 50  0001 C CNN
-F 3 "~" H 2900 2100 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 2900 2100 50  0001 C CNN "Mouser"
-	1    2900 2100
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	4350 1900 4350 2950
-Wire Wire Line
-	2900 2000 2900 1900
-Wire Wire Line
-	2900 1900 3250 1900
-Wire Wire Line
-	3250 2000 3250 1900
-Connection ~ 3250 1900
-Wire Wire Line
-	3250 1900 3600 1900
 Wire Wire Line
 	3600 2000 3600 1900
 Connection ~ 3600 1900
@@ -444,60 +412,32 @@ F 3 "" H 3600 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR04
-U 1 1 5DC6E2AA
-P 3250 2300
-F 0 "#PWR04" H 3250 2050 50  0001 C CNN
-F 1 "GND" H 3250 2150 50  0000 C CNN
-F 2 "" H 3250 2300 50  0001 C CNN
-F 3 "" H 3250 2300 50  0001 C CNN
-	1    3250 2300
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR03
-U 1 1 5DC6E488
-P 2900 2300
-F 0 "#PWR03" H 2900 2050 50  0001 C CNN
-F 1 "GND" H 2900 2150 50  0000 C CNN
-F 2 "" H 2900 2300 50  0001 C CNN
-F 3 "" H 2900 2300 50  0001 C CNN
-	1    2900 2300
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:C_Small C1
 U 1 1 5DC6EF88
-P 2550 2100
-F 0 "C1" H 2560 2170 50  0000 L CNN
-F 1 "100 pF" H 2560 2020 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2550 2100 50  0001 C CNN
-F 3 "~" H 2550 2100 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 2550 2100 50  0001 C CNN "Mouser"
-	1    2550 2100
+P 3150 2100
+F 0 "C1" H 3160 2170 50  0000 L CNN
+F 1 "100 pF" H 3160 2020 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3150 2100 50  0001 C CNN
+F 3 "~" H 3150 2100 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 3150 2100 50  0001 C CNN "Mouser"
+	1    3150 2100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2550 2000 2550 1900
-Wire Wire Line
-	2550 1900 2900 1900
+	3150 2000 3150 1900
 $Comp
 L power:GND #PWR02
 U 1 1 5DC6FAEE
-P 2550 2300
-F 0 "#PWR02" H 2550 2050 50  0001 C CNN
-F 1 "GND" H 2550 2150 50  0000 C CNN
-F 2 "" H 2550 2300 50  0001 C CNN
-F 3 "" H 2550 2300 50  0001 C CNN
-	1    2550 2300
+P 3150 2300
+F 0 "#PWR02" H 3150 2050 50  0001 C CNN
+F 1 "GND" H 3150 2150 50  0000 C CNN
+F 2 "" H 3150 2300 50  0001 C CNN
+F 3 "" H 3150 2300 50  0001 C CNN
+	1    3150 2300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2550 2200 2550 2300
-Wire Wire Line
-	2900 2300 2900 2200
-Wire Wire Line
-	3250 2200 3250 2300
+	3150 2200 3150 2300
 Wire Wire Line
 	3600 2300 3600 2200
 Wire Wire Line
@@ -519,43 +459,26 @@ U 1 1 5DC78753
 P 8700 2300
 F 0 "C6" H 8710 2370 50  0000 L CNN
 F 1 "0.01 uF" H 8710 2220 50  0000 L CNN
-F 2 "" H 8700 2300 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 8700 2300 50  0001 C CNN
 F 3 "~" H 8700 2300 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 8700 2300 50  0001 C CNN "Mouser"
 	1    8700 2300
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C8
-U 1 1 5DC78759
-P 9450 2300
-F 0 "C8" H 9460 2370 50  0000 L CNN
-F 1 "470 pF" H 9460 2220 50  0000 L CNN
-F 2 "" H 9450 2300 50  0001 C CNN
-F 3 "~" H 9450 2300 50  0001 C CNN
-	1    9450 2300
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Device:C_Small C10
 U 1 1 5DC7875F
-P 9800 2300
-F 0 "C10" H 9810 2370 50  0000 L CNN
-F 1 "100 pF" H 9810 2220 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 9800 2300 50  0001 C CNN
-F 3 "~" H 9800 2300 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 9800 2300 50  0001 C CNN "Mouser"
-	1    9800 2300
+P 9500 2300
+F 0 "C10" H 9510 2370 50  0000 L CNN
+F 1 "100 pF" H 9510 2220 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9500 2300 50  0001 C CNN
+F 3 "~" H 9500 2300 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 9500 2300 50  0001 C CNN "Mouser"
+	1    9500 2300
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	9800 2200 9800 2100
-Wire Wire Line
-	9800 2100 9450 2100
-Wire Wire Line
-	9450 2200 9450 2100
-Connection ~ 9450 2100
-Wire Wire Line
-	9450 2100 9100 2100
+	9500 2200 9500 2100
 Wire Wire Line
 	9100 2200 9100 2100
 Connection ~ 9100 2100
@@ -587,65 +510,22 @@ F 3 "" H 9100 2500 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR015
-U 1 1 5DC7877C
-P 9450 2500
-F 0 "#PWR015" H 9450 2250 50  0001 C CNN
-F 1 "GND" H 9450 2350 50  0000 C CNN
-F 2 "" H 9450 2500 50  0001 C CNN
-F 3 "" H 9450 2500 50  0001 C CNN
-	1    9450 2500
-	-1   0    0    -1  
-$EndComp
-$Comp
 L power:GND #PWR017
 U 1 1 5DC78782
-P 9800 2500
-F 0 "#PWR017" H 9800 2250 50  0001 C CNN
-F 1 "GND" H 9800 2350 50  0000 C CNN
-F 2 "" H 9800 2500 50  0001 C CNN
-F 3 "" H 9800 2500 50  0001 C CNN
-	1    9800 2500
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C11
-U 1 1 5DC78788
-P 10150 2300
-F 0 "C11" H 10160 2370 50  0000 L CNN
-F 1 "100 pF" H 10160 2220 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 10150 2300 50  0001 C CNN
-F 3 "~" H 10150 2300 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 10150 2300 50  0001 C CNN "Mouser"
-	1    10150 2300
+P 9500 2500
+F 0 "#PWR017" H 9500 2250 50  0001 C CNN
+F 1 "GND" H 9500 2350 50  0000 C CNN
+F 2 "" H 9500 2500 50  0001 C CNN
+F 3 "" H 9500 2500 50  0001 C CNN
+	1    9500 2500
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	10150 2200 10150 2100
-Wire Wire Line
-	10150 2100 9800 2100
-$Comp
-L power:GND #PWR018
-U 1 1 5DC78790
-P 10150 2500
-F 0 "#PWR018" H 10150 2250 50  0001 C CNN
-F 1 "GND" H 10150 2350 50  0000 C CNN
-F 2 "" H 10150 2500 50  0001 C CNN
-F 3 "" H 10150 2500 50  0001 C CNN
-	1    10150 2500
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	10150 2400 10150 2500
-Wire Wire Line
-	9800 2500 9800 2400
-Wire Wire Line
-	9450 2400 9450 2500
+	9500 2500 9500 2400
 Wire Wire Line
 	9100 2500 9100 2400
 Wire Wire Line
 	8700 2500 8700 2400
-Connection ~ 9800 2100
 Wire Wire Line
 	8300 2850 8300 2100
 Wire Wire Line
@@ -1238,4 +1118,8 @@ Wire Wire Line
 	2300 4800 2450 4800
 Wire Wire Line
 	1150 5350 1250 5350
+Wire Wire Line
+	9100 2100 9500 2100
+Wire Wire Line
+	3150 1900 3600 1900
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch b/pcb/discrete/discrete-rf-board/if_amp.sch
index a9b280f..501cfec 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch
@@ -15,12 +15,12 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:R_Small R97
+L Device:R_Small R101
 U 1 1 5CC4F99A
 P 2850 2250
-AR Path="/5CA6B0AA/5CC4DFC2/5CC4F99A" Ref="R97"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC4F99A" Ref="R121"  Part="1" 
-F 0 "R121" H 2880 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC4F99A" Ref="R101"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC4F99A" Ref="R125"  Part="1" 
+F 0 "R125" H 2880 2270 50  0000 L CNN
 F 1 "25R" H 2880 2210 50  0000 L CNN
 F 2 "" H 2850 2250 50  0001 C CNN
 F 3 "~" H 2850 2250 50  0001 C CNN
@@ -28,12 +28,12 @@ F 3 "~" H 2850 2250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:Q_NPN_BCE Q24
+L Device:Q_NPN_BCE Q16
 U 1 1 5CC4FF85
 P 2350 3650
-AR Path="/5CA6B0AA/5CC4DFC2/5CC4FF85" Ref="Q24"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC4FF85" Ref="Q27"  Part="1" 
-F 0 "Q27" H 2550 3700 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC4FF85" Ref="Q16"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC4FF85" Ref="Q19"  Part="1" 
+F 0 "Q19" H 2550 3700 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2550 3600 50  0000 L CNN
 F 2 "" H 2550 3750 50  0001 C CNN
 F 3 "~" H 2350 3650 50  0001 C CNN
@@ -41,12 +41,12 @@ F 3 "~" H 2350 3650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R96
+L Device:R_Small R100
 U 1 1 5CC50F59
 P 2450 4100
-AR Path="/5CA6B0AA/5CC4DFC2/5CC50F59" Ref="R96"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC50F59" Ref="R120"  Part="1" 
-F 0 "R120" H 2480 4120 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC50F59" Ref="R100"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC50F59" Ref="R124"  Part="1" 
+F 0 "R124" H 2480 4120 50  0000 L CNN
 F 1 "22R" H 2480 4060 50  0000 L CNN
 F 2 "" H 2450 4100 50  0001 C CNN
 F 3 "~" H 2450 4100 50  0001 C CNN
@@ -54,12 +54,12 @@ F 3 "~" H 2450 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R93
+L Device:R_Small R97
 U 1 1 5CC5132A
 P 1650 2700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R93"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R117"  Part="1" 
-F 0 "R117" H 1680 2720 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R97"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R121"  Part="1" 
+F 0 "R121" H 1680 2720 50  0000 L CNN
 F 1 "10kR" H 1680 2660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 2700 50  0001 C CNN
 F 3 "~" H 1650 2700 50  0001 C CNN
@@ -68,12 +68,12 @@ F 4 "603-AC0402FR-1310KL" H 1650 2700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R94
+L Device:R_Small R98
 U 1 1 5CC51AB5
 P 1650 3150
-AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R94"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R118"  Part="1" 
-F 0 "R118" H 1680 3170 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R98"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R122"  Part="1" 
+F 0 "R122" H 1680 3170 50  0000 L CNN
 F 1 "10kR" H 1680 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 3150 50  0001 C CNN
 F 3 "~" H 1650 3150 50  0001 C CNN
@@ -82,12 +82,12 @@ F 4 "603-AC0402FR-1310KL" H 1650 3150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R99
+L Device:R_Small R103
 U 1 1 5CC51E44
 P 3250 3150
-AR Path="/5CA6B0AA/5CC4DFC2/5CC51E44" Ref="R99"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC51E44" Ref="R123"  Part="1" 
-F 0 "R123" H 3280 3170 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC51E44" Ref="R103"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC51E44" Ref="R127"  Part="1" 
+F 0 "R127" H 3280 3170 50  0000 L CNN
 F 1 "10kR" H 3280 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 3150 50  0001 C CNN
 F 3 "~" H 3250 3150 50  0001 C CNN
@@ -96,12 +96,12 @@ F 4 "603-AC0402FR-1310KL" H 3250 3150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R98
+L Device:R_Small R102
 U 1 1 5CC52920
 P 3250 2650
-AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R98"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R122"  Part="1" 
-F 0 "R122" H 3280 2670 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R102"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R126"  Part="1" 
+F 0 "R126" H 3280 2670 50  0000 L CNN
 F 1 "10kR" H 3280 2610 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 2650 50  0001 C CNN
 F 3 "~" H 3250 2650 50  0001 C CNN
@@ -155,12 +155,12 @@ Connection ~ 3250 2900
 Wire Wire Line
 	3250 2900 3250 3050
 $Comp
-L power:GND #PWR0154
+L power:GND #PWR0151
 U 1 1 5CC541C5
 P 3250 3350
-AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0154"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0177"  Part="1" 
-F 0 "#PWR0177" H 3250 3100 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0151"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0174"  Part="1" 
+F 0 "#PWR0174" H 3250 3100 50  0001 C CNN
 F 1 "GND" H 3250 3200 50  0000 C CNN
 F 2 "" H 3250 3350 50  0001 C CNN
 F 3 "" H 3250 3350 50  0001 C CNN
@@ -168,12 +168,12 @@ F 3 "" H 3250 3350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0150
+L power:GND #PWR0147
 U 1 1 5CC543E7
 P 1650 3350
-AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0150"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0173"  Part="1" 
-F 0 "#PWR0173" H 1650 3100 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0147"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0170"  Part="1" 
+F 0 "#PWR0170" H 1650 3100 50  0001 C CNN
 F 1 "GND" H 1650 3200 50  0000 C CNN
 F 2 "" H 1650 3350 50  0001 C CNN
 F 3 "" H 1650 3350 50  0001 C CNN
@@ -181,12 +181,12 @@ F 3 "" H 1650 3350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0151
+L power:GND #PWR0148
 U 1 1 5CC54945
 P 2450 4300
-AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0151"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0174"  Part="1" 
-F 0 "#PWR0174" H 2450 4050 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0148"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0171"  Part="1" 
+F 0 "#PWR0171" H 2450 4050 50  0001 C CNN
 F 1 "GND" H 2450 4150 50  0000 C CNN
 F 2 "" H 2450 4300 50  0001 C CNN
 F 3 "" H 2450 4300 50  0001 C CNN
@@ -233,12 +233,12 @@ IN+
 Text HLabel 3550 2900 2    50   Input ~ 0
 IN-
 $Comp
-L Device:C_Small C118
+L Device:C_Small C117
 U 1 1 5CC63FED
 P 1300 3900
-AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C118"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C142"  Part="1" 
-F 0 "C142" H 1310 3970 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C117"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C141"  Part="1" 
+F 0 "C141" H 1310 3970 50  0000 L CNN
 F 1 "0.1 uF" H 1310 3820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1300 3900 50  0001 C CNN
 F 3 "~" H 1300 3900 50  0001 C CNN
@@ -247,12 +247,12 @@ F 4 "80-C0402C104M4P" H 1300 3900 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0149
+L power:GND #PWR0146
 U 1 1 5CC64E30
 P 1300 4150
-AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0149"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0172"  Part="1" 
-F 0 "#PWR0172" H 1300 3900 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0146"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0169"  Part="1" 
+F 0 "#PWR0169" H 1300 3900 50  0001 C CNN
 F 1 "GND" H 1300 4000 50  0000 C CNN
 F 2 "" H 1300 4150 50  0001 C CNN
 F 3 "" H 1300 4150 50  0001 C CNN
@@ -266,12 +266,12 @@ Wire Wire Line
 Wire Wire Line
 	1300 4000 1300 4150
 $Comp
-L Device:R_Small R102
+L Device:R_Small R106
 U 1 1 5CC7100E
 P 6150 2000
-AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R102"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R126"  Part="1" 
-F 0 "R126" H 6180 2020 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R106"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R130"  Part="1" 
+F 0 "R130" H 6180 2020 50  0000 L CNN
 F 1 "100R" H 6180 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 2000 50  0001 C CNN
 F 3 "~" H 6150 2000 50  0001 C CNN
@@ -280,12 +280,12 @@ F 4 " 667-ERJ-U02D1000X " H 6150 2000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R105
+L Device:R_Small R109
 U 1 1 5CC71014
 P 6950 2000
-AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R105"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R129"  Part="1" 
-F 0 "R129" H 6980 2020 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R109"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R133"  Part="1" 
+F 0 "R133" H 6980 2020 50  0000 L CNN
 F 1 "100R" H 6980 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 2000 50  0001 C CNN
 F 3 "~" H 6950 2000 50  0001 C CNN
@@ -294,12 +294,12 @@ F 4 " 667-ERJ-U02D1000X " H 6950 2000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R100
+L Device:R_Small R104
 U 1 1 5CC71026
 P 5750 2450
-AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R100"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R124"  Part="1" 
-F 0 "R124" H 5780 2470 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R104"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R128"  Part="1" 
+F 0 "R128" H 5780 2470 50  0000 L CNN
 F 1 "10kR" H 5780 2410 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2450 50  0001 C CNN
 F 3 "~" H 5750 2450 50  0001 C CNN
@@ -308,12 +308,12 @@ F 4 "603-AC0402FR-1310KL" H 5750 2450 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R101
+L Device:R_Small R105
 U 1 1 5CC7102C
 P 5750 2900
-AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R101"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R125"  Part="1" 
-F 0 "R125" H 5780 2920 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R105"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R129"  Part="1" 
+F 0 "R129" H 5780 2920 50  0000 L CNN
 F 1 "10kR" H 5780 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2900 50  0001 C CNN
 F 3 "~" H 5750 2900 50  0001 C CNN
@@ -322,12 +322,12 @@ F 4 "603-AC0402FR-1310KL" H 5750 2900 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R108
+L Device:R_Small R112
 U 1 1 5CC71032
 P 7350 2900
-AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R108"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R132"  Part="1" 
-F 0 "R132" H 7380 2920 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R112"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R136"  Part="1" 
+F 0 "R136" H 7380 2920 50  0000 L CNN
 F 1 "10kR" H 7380 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2900 50  0001 C CNN
 F 3 "~" H 7350 2900 50  0001 C CNN
@@ -336,12 +336,12 @@ F 4 "603-AC0402FR-1310KL" H 7350 2900 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R107
+L Device:R_Small R111
 U 1 1 5CC71038
 P 7350 2400
-AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R107"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R131"  Part="1" 
-F 0 "R131" H 7380 2420 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R111"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R135"  Part="1" 
+F 0 "R135" H 7380 2420 50  0000 L CNN
 F 1 "10kR" H 7380 2360 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2400 50  0001 C CNN
 F 3 "~" H 7350 2400 50  0001 C CNN
@@ -389,12 +389,12 @@ Connection ~ 7350 2650
 Wire Wire Line
 	7350 2650 7350 2800
 $Comp
-L power:GND #PWR0165
+L power:GND #PWR0162
 U 1 1 5CC71057
 P 7350 3100
-AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0165"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0188"  Part="1" 
-F 0 "#PWR0188" H 7350 2850 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0162"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0185"  Part="1" 
+F 0 "#PWR0185" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -402,12 +402,12 @@ F 3 "" H 7350 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0163
+L power:GND #PWR0160
 U 1 1 5CC7105D
 P 5750 3100
-AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0163"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0186"  Part="1" 
-F 0 "#PWR0186" H 5750 2850 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0160"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0183"  Part="1" 
+F 0 "#PWR0183" H 5750 2850 50  0001 C CNN
 F 1 "GND" H 5750 2950 50  0000 C CNN
 F 2 "" H 5750 3100 50  0001 C CNN
 F 3 "" H 5750 3100 50  0001 C CNN
@@ -439,12 +439,12 @@ Text Label 6950 1500 0    50   ~ 0
 Wire Wire Line
 	6150 1500 6950 1500
 $Comp
-L Device:R_Small R104
+L Device:R_Small R108
 U 1 1 5CC78AA9
 P 6550 3700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC78AA9" Ref="R104"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC78AA9" Ref="R128"  Part="1" 
-F 0 "R128" H 6580 3720 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC78AA9" Ref="R108"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC78AA9" Ref="R132"  Part="1" 
+F 0 "R132" H 6580 3720 50  0000 L CNN
 F 1 "330R" H 6580 3660 50  0000 L CNN
 F 2 "" H 6550 3700 50  0001 C CNN
 F 3 "~" H 6550 3700 50  0001 C CNN
@@ -452,12 +452,12 @@ F 3 "~" H 6550 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0164
+L power:GND #PWR0161
 U 1 1 5CC7911F
 P 6550 3900
-AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0164"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0187"  Part="1" 
-F 0 "#PWR0187" H 6550 3650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0161"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0184"  Part="1" 
+F 0 "#PWR0184" H 6550 3650 50  0001 C CNN
 F 1 "GND" H 6550 3750 50  0000 C CNN
 F 2 "" H 6550 3900 50  0001 C CNN
 F 3 "" H 6550 3900 50  0001 C CNN
@@ -467,12 +467,12 @@ $EndComp
 Wire Wire Line
 	6550 3800 6550 3900
 $Comp
-L Device:R_Small R103
+L Device:R_Small R107
 U 1 1 5CC7FE22
 P 6150 3200
-AR Path="/5CA6B0AA/5CC4DFC2/5CC7FE22" Ref="R103"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC7FE22" Ref="R127"  Part="1" 
-F 0 "R127" H 6180 3220 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC7FE22" Ref="R107"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC7FE22" Ref="R131"  Part="1" 
+F 0 "R131" H 6180 3220 50  0000 L CNN
 F 1 "22R" H 6180 3160 50  0000 L CNN
 F 2 "" H 6150 3200 50  0001 C CNN
 F 3 "~" H 6150 3200 50  0001 C CNN
@@ -480,12 +480,12 @@ F 3 "~" H 6150 3200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R106
+L Device:R_Small R110
 U 1 1 5CC80169
 P 6950 3150
-AR Path="/5CA6B0AA/5CC4DFC2/5CC80169" Ref="R106"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC80169" Ref="R130"  Part="1" 
-F 0 "R130" H 6980 3170 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC80169" Ref="R110"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC80169" Ref="R134"  Part="1" 
+F 0 "R134" H 6980 3170 50  0000 L CNN
 F 1 "22R" H 6980 3110 50  0000 L CNN
 F 2 "" H 6950 3150 50  0001 C CNN
 F 3 "~" H 6950 3150 50  0001 C CNN
@@ -510,12 +510,12 @@ OUT+
 Text HLabel 10200 5650 2    50   Input ~ 0
 OUT-
 $Comp
-L Device:C_Small C126
+L Device:C_Small C125
 U 1 1 5CC9409E
 P 4500 2650
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C126"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C150"  Part="1" 
-F 0 "C150" H 4510 2720 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C125"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C149"  Part="1" 
+F 0 "C149" H 4510 2720 50  0000 L CNN
 F 1 "0.1 uF" H 4510 2570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 2650 50  0001 C CNN
 F 3 "~" H 4500 2650 50  0001 C CNN
@@ -526,12 +526,12 @@ $EndComp
 Wire Wire Line
 	4300 2650 4400 2650
 $Comp
-L Device:C_Small C131
+L Device:C_Small C130
 U 1 1 5CC959FD
 P 8750 2550
-AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C131"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C155"  Part="1" 
-F 0 "C155" H 8760 2620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C130"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C154"  Part="1" 
+F 0 "C154" H 8760 2620 50  0000 L CNN
 F 1 "0.1 uF" H 8760 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8750 2550 50  0001 C CNN
 F 3 "~" H 8750 2550 50  0001 C CNN
@@ -664,12 +664,12 @@ I+
 Text Label 4300 2850 2    50   ~ 0
 I-
 $Comp
-L Device:C_Small C127
+L Device:C_Small C126
 U 1 1 5CC5931A
 P 4550 2850
-AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C127"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C151"  Part="1" 
-F 0 "C151" H 4560 2920 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C126"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C150"  Part="1" 
+F 0 "C150" H 4560 2920 50  0000 L CNN
 F 1 "0.1 uF" H 4560 2770 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4550 2850 50  0001 C CNN
 F 3 "~" H 4550 2850 50  0001 C CNN
@@ -686,12 +686,12 @@ Wire Wire Line
 Text Label 9100 2750 0    50   ~ 0
 I+
 $Comp
-L Device:C_Small C132
+L Device:C_Small C131
 U 1 1 5CC646BF
 P 8850 2750
-AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C132"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C156"  Part="1" 
-F 0 "C156" H 8860 2820 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C131"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C155"  Part="1" 
+F 0 "C155" H 8860 2820 50  0000 L CNN
 F 1 "0.1 uF" H 8860 2670 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8850 2750 50  0001 C CNN
 F 3 "~" H 8850 2750 50  0001 C CNN
@@ -782,12 +782,12 @@ Wire Wire Line
 	4950 6500 5150 6500
 Connection ~ 4150 6100
 $Comp
-L Device:C_Small C120
+L Device:C_Small C119
 U 1 1 5CC9DCE4
 P 3050 5700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C120"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C144"  Part="1" 
-F 0 "C144" H 3060 5770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C119"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C143"  Part="1" 
+F 0 "C143" H 3060 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3060 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3050 5700 50  0001 C CNN
 F 3 "~" H 3050 5700 50  0001 C CNN
@@ -796,12 +796,12 @@ F 4 "80-C0402C104M4P" H 3050 5700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C121
+L Device:C_Small C120
 U 1 1 5CC9E1ED
 P 3550 5700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C121"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C145"  Part="1" 
-F 0 "C145" H 3560 5770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C120"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C144"  Part="1" 
+F 0 "C144" H 3560 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3560 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3550 5700 50  0001 C CNN
 F 3 "~" H 3550 5700 50  0001 C CNN
@@ -810,12 +810,12 @@ F 4 "80-C0402C104M4P" H 3550 5700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C123
+L Device:C_Small C122
 U 1 1 5CC9E6BF
 P 4000 5700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C123"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C147"  Part="1" 
-F 0 "C147" H 4010 5770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C122"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C146"  Part="1" 
+F 0 "C146" H 4010 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4010 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4000 5700 50  0001 C CNN
 F 3 "~" H 4000 5700 50  0001 C CNN
@@ -824,12 +824,12 @@ F 4 "80-C0402C104M4P" H 4000 5700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C125
+L Device:C_Small C124
 U 1 1 5CC9EAA6
 P 4450 5700
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C125"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C149"  Part="1" 
-F 0 "C149" H 4460 5770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C124"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C148"  Part="1" 
+F 0 "C148" H 4460 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4460 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 5700 50  0001 C CNN
 F 3 "~" H 4450 5700 50  0001 C CNN
@@ -838,12 +838,12 @@ F 4 "80-C0402C104M4P" H 4450 5700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0152
+L power:GND #PWR0149
 U 1 1 5CC9F407
 P 2500 6800
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0152"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0175"  Part="1" 
-F 0 "#PWR0175" H 2500 6550 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0149"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0172"  Part="1" 
+F 0 "#PWR0172" H 2500 6550 50  0001 C CNN
 F 1 "GND" H 2500 6650 50  0000 C CNN
 F 2 "" H 2500 6800 50  0001 C CNN
 F 3 "" H 2500 6800 50  0001 C CNN
@@ -851,12 +851,12 @@ F 3 "" H 2500 6800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0155
+L power:GND #PWR0152
 U 1 1 5CC9FAC5
 P 3350 6800
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0155"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0178"  Part="1" 
-F 0 "#PWR0178" H 3350 6550 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0152"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0175"  Part="1" 
+F 0 "#PWR0175" H 3350 6550 50  0001 C CNN
 F 1 "GND" H 3350 6650 50  0000 C CNN
 F 2 "" H 3350 6800 50  0001 C CNN
 F 3 "" H 3350 6800 50  0001 C CNN
@@ -864,12 +864,12 @@ F 3 "" H 3350 6800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0160
+L power:GND #PWR0157
 U 1 1 5CC9FD6D
 P 4300 6800
-AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0160"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 4300 6550 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0157"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0180"  Part="1" 
+F 0 "#PWR0180" H 4300 6550 50  0001 C CNN
 F 1 "GND" H 4300 6650 50  0000 C CNN
 F 2 "" H 4300 6800 50  0001 C CNN
 F 3 "" H 4300 6800 50  0001 C CNN
@@ -877,12 +877,12 @@ F 3 "" H 4300 6800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0162
+L power:GND #PWR0159
 U 1 1 5CCA0195
 P 5050 6800
-AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0162"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0185"  Part="1" 
-F 0 "#PWR0185" H 5050 6550 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0159"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0182"  Part="1" 
+F 0 "#PWR0182" H 5050 6550 50  0001 C CNN
 F 1 "GND" H 5050 6650 50  0000 C CNN
 F 2 "" H 5050 6800 50  0001 C CNN
 F 3 "" H 5050 6800 50  0001 C CNN
@@ -890,12 +890,12 @@ F 3 "" H 5050 6800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0153
+L power:GND #PWR0150
 U 1 1 5CCA0420
 P 3050 5900
-AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0153"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0176"  Part="1" 
-F 0 "#PWR0176" H 3050 5650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0150"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0173"  Part="1" 
+F 0 "#PWR0173" H 3050 5650 50  0001 C CNN
 F 1 "GND" H 3050 5750 50  0000 C CNN
 F 2 "" H 3050 5900 50  0001 C CNN
 F 3 "" H 3050 5900 50  0001 C CNN
@@ -903,12 +903,12 @@ F 3 "" H 3050 5900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0156
+L power:GND #PWR0153
 U 1 1 5CCA07DE
 P 3550 5900
-AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0156"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0179"  Part="1" 
-F 0 "#PWR0179" H 3550 5650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0153"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0176"  Part="1" 
+F 0 "#PWR0176" H 3550 5650 50  0001 C CNN
 F 1 "GND" H 3550 5750 50  0000 C CNN
 F 2 "" H 3550 5900 50  0001 C CNN
 F 3 "" H 3550 5900 50  0001 C CNN
@@ -916,12 +916,12 @@ F 3 "" H 3550 5900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0158
+L power:GND #PWR0155
 U 1 1 5CCA0A90
 P 4000 5900
-AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0158"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0181"  Part="1" 
-F 0 "#PWR0181" H 4000 5650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0155"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0178"  Part="1" 
+F 0 "#PWR0178" H 4000 5650 50  0001 C CNN
 F 1 "GND" H 4000 5750 50  0000 C CNN
 F 2 "" H 4000 5900 50  0001 C CNN
 F 3 "" H 4000 5900 50  0001 C CNN
@@ -929,12 +929,12 @@ F 3 "" H 4000 5900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0161
+L power:GND #PWR0158
 U 1 1 5CCA0D69
 P 4450 5900
-AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0161"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0184"  Part="1" 
-F 0 "#PWR0184" H 4450 5650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0158"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0181"  Part="1" 
+F 0 "#PWR0181" H 4450 5650 50  0001 C CNN
 F 1 "GND" H 4450 5750 50  0000 C CNN
 F 2 "" H 4450 5900 50  0001 C CNN
 F 3 "" H 4450 5900 50  0001 C CNN
@@ -1167,12 +1167,12 @@ Wire Wire Line
 Wire Wire Line
 	6550 3350 6550 3450
 $Comp
-L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q23
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q15
 U 1 1 5CC8B3B3
 P 1950 3000
-AR Path="/5CA6B0AA/5CC4DFC2/5CC8B3B3" Ref="Q23"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC8B3B3" Ref="Q26"  Part="1" 
-F 0 "Q26" H 2150 3050 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC8B3B3" Ref="Q15"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC8B3B3" Ref="Q18"  Part="1" 
+F 0 "Q18" H 2150 3050 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 2150 2950 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2150 3100 50  0001 C CNN
 F 3 "~" H 1950 3000 50  0001 C CNN
@@ -1181,12 +1181,12 @@ F 4 " 863-NSVT65011MW6T1G" H 1950 3000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q23
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q15
 U 2 1 5CC8BBB5
 P 2950 2900
-AR Path="/5CA6B0AA/5CC4DFC2/5CC8BBB5" Ref="Q23"  Part="2" 
-AR Path="/5CA6B0AA/5CC9409A/5CC8BBB5" Ref="Q26"  Part="2" 
-F 0 "Q26" H 3150 2950 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC8BBB5" Ref="Q15"  Part="2" 
+AR Path="/5CA6B0AA/5CC9409A/5CC8BBB5" Ref="Q18"  Part="2" 
+F 0 "Q18" H 3150 2950 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3150 2850 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3150 3000 50  0001 C CNN
 F 3 "~" H 2950 2900 50  0001 C CNN
@@ -1195,12 +1195,12 @@ F 4 " 863-NSVT65011MW6T1G" H 2950 2900 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q25
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q17
 U 1 1 5CC8C47F
 P 6050 2750
-AR Path="/5CA6B0AA/5CC4DFC2/5CC8C47F" Ref="Q25"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC8C47F" Ref="Q28"  Part="1" 
-F 0 "Q28" H 6250 2800 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC8C47F" Ref="Q17"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC8C47F" Ref="Q20"  Part="1" 
+F 0 "Q20" H 6250 2800 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6250 2700 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6250 2850 50  0001 C CNN
 F 3 "~" H 6050 2750 50  0001 C CNN
@@ -1209,12 +1209,12 @@ F 4 " 863-NSVT65011MW6T1G" H 6050 2750 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q25
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q17
 U 2 1 5CC8CC50
 P 7050 2650
-AR Path="/5CA6B0AA/5CC4DFC2/5CC8CC50" Ref="Q25"  Part="2" 
-AR Path="/5CA6B0AA/5CC9409A/5CC8CC50" Ref="Q28"  Part="2" 
-F 0 "Q28" H 7250 2700 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC8CC50" Ref="Q17"  Part="2" 
+AR Path="/5CA6B0AA/5CC9409A/5CC8CC50" Ref="Q20"  Part="2" 
+F 0 "Q20" H 7250 2700 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 7250 2600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 7250 2750 50  0001 C CNN
 F 3 "~" H 7050 2650 50  0001 C CNN
@@ -1223,12 +1223,12 @@ F 4 " 863-NSVT65011MW6T1G" H 7050 2650 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C122
+L Device:C_Small C121
 U 1 1 5D57AB5D
 P 3650 1950
-AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C122"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C146"  Part="1" 
-F 0 "C146" H 3660 2020 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C121"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C145"  Part="1" 
+F 0 "C145" H 3660 2020 50  0000 L CNN
 F 1 "0.1 uF" H 3660 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3650 1950 50  0001 C CNN
 F 3 "~" H 3650 1950 50  0001 C CNN
@@ -1237,12 +1237,12 @@ F 4 "80-C0402C104M4P" H 3650 1950 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C124
+L Device:C_Small C123
 U 1 1 5D57AB63
 P 4100 1950
-AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C124"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C148"  Part="1" 
-F 0 "C148" H 4110 2020 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C123"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C147"  Part="1" 
+F 0 "C147" H 4110 2020 50  0000 L CNN
 F 1 "0.1 uF" H 4110 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4100 1950 50  0001 C CNN
 F 3 "~" H 4100 1950 50  0001 C CNN
@@ -1251,12 +1251,12 @@ F 4 "80-C0402C104M4P" H 4100 1950 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0157
+L power:GND #PWR0154
 U 1 1 5D57AB69
 P 3650 2150
-AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0157"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0180"  Part="1" 
-F 0 "#PWR0180" H 3650 1900 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0154"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0177"  Part="1" 
+F 0 "#PWR0177" H 3650 1900 50  0001 C CNN
 F 1 "GND" H 3650 2000 50  0000 C CNN
 F 2 "" H 3650 2150 50  0001 C CNN
 F 3 "" H 3650 2150 50  0001 C CNN
@@ -1264,12 +1264,12 @@ F 3 "" H 3650 2150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0159
+L power:GND #PWR0156
 U 1 1 5D57AB6F
 P 4100 2150
-AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0159"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0182"  Part="1" 
-F 0 "#PWR0182" H 4100 1900 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0156"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0179"  Part="1" 
+F 0 "#PWR0179" H 4100 1900 50  0001 C CNN
 F 1 "GND" H 4100 2000 50  0000 C CNN
 F 2 "" H 4100 2150 50  0001 C CNN
 F 3 "" H 4100 2150 50  0001 C CNN
@@ -1288,12 +1288,12 @@ Connection ~ 3650 1750
 Wire Wire Line
 	3650 1750 4100 1750
 $Comp
-L Device:C_Small C129
+L Device:C_Small C128
 U 1 1 5D580ACE
 P 7850 1700
-AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C129"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C153"  Part="1" 
-F 0 "C153" H 7860 1770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C128"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C152"  Part="1" 
+F 0 "C152" H 7860 1770 50  0000 L CNN
 F 1 "0.1 uF" H 7860 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7850 1700 50  0001 C CNN
 F 3 "~" H 7850 1700 50  0001 C CNN
@@ -1302,12 +1302,12 @@ F 4 "80-C0402C104M4P" H 7850 1700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C130
+L Device:C_Small C129
 U 1 1 5D580AD4
 P 8300 1700
-AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C130"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C154"  Part="1" 
-F 0 "C154" H 8310 1770 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C129"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C153"  Part="1" 
+F 0 "C153" H 8310 1770 50  0000 L CNN
 F 1 "0.1 uF" H 8310 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8300 1700 50  0001 C CNN
 F 3 "~" H 8300 1700 50  0001 C CNN
@@ -1316,12 +1316,12 @@ F 4 "80-C0402C104M4P" H 8300 1700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0166
+L power:GND #PWR0163
 U 1 1 5D580ADA
 P 7850 1900
-AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0166"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0189"  Part="1" 
-F 0 "#PWR0189" H 7850 1650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0163"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0186"  Part="1" 
+F 0 "#PWR0186" H 7850 1650 50  0001 C CNN
 F 1 "GND" H 7850 1750 50  0000 C CNN
 F 2 "" H 7850 1900 50  0001 C CNN
 F 3 "" H 7850 1900 50  0001 C CNN
@@ -1329,12 +1329,12 @@ F 3 "" H 7850 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0167
+L power:GND #PWR0164
 U 1 1 5D580AE0
 P 8300 1900
-AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0167"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0190"  Part="1" 
-F 0 "#PWR0190" H 8300 1650 50  0001 C CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0164"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0187"  Part="1" 
+F 0 "#PWR0187" H 8300 1650 50  0001 C CNN
 F 1 "GND" H 8300 1750 50  0000 C CNN
 F 2 "" H 8300 1900 50  0001 C CNN
 F 3 "" H 8300 1900 50  0001 C CNN
@@ -1359,12 +1359,12 @@ Wire Wire Line
 	2850 1750 3650 1750
 Connection ~ 2850 1750
 $Comp
-L Device:C_Small C119
+L Device:C_Small C118
 U 1 1 5DA03B3D
 P 2500 2450
-AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C119"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C143"  Part="1" 
-F 0 "C143" H 2510 2520 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C118"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C142"  Part="1" 
+F 0 "C142" H 2510 2520 50  0000 L CNN
 F 1 "2.5 nF" H 2510 2370 50  0000 L CNN
 F 2 "" H 2500 2450 50  0001 C CNN
 F 3 "~" H 2500 2450 50  0001 C CNN
@@ -1379,12 +1379,12 @@ Connection ~ 2050 2450
 Wire Wire Line
 	2050 2450 2050 2350
 $Comp
-L Device:C_Small C128
+L Device:C_Small C127
 U 1 1 5DA0FE44
 P 6600 2200
-AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C128"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C152"  Part="1" 
-F 0 "C152" H 6610 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C127"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C151"  Part="1" 
+F 0 "C151" H 6610 2270 50  0000 L CNN
 F 1 "470 pF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -1407,12 +1407,12 @@ Text Notes 1300 3600 0    50   ~ 0
 Text Notes 2500 3950 0    50   ~ 0
 0.7 V max\n30 mA max
 $Comp
-L Device:R_Small R95
+L Device:R_Small R99
 U 1 1 5CC4F475
 P 2050 2250
-AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R95"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R119"  Part="1" 
-F 0 "R119" H 2080 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R99"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R123"  Part="1" 
+F 0 "R123" H 2080 2270 50  0000 L CNN
 F 1 "25R" H 2080 2210 50  0000 L CNN
 F 2 "" H 2050 2250 50  0001 C CNN
 F 3 "~" H 2050 2250 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch-bak b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
index bff1f5a..a9b280f 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch-bak
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
@@ -61,8 +61,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R93"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R117"  Part="1" 
 F 0 "R117" H 1680 2720 50  0000 L CNN
 F 1 "10kR" H 1680 2660 50  0000 L CNN
-F 2 "" H 1650 2700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 2700 50  0001 C CNN
 F 3 "~" H 1650 2700 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 1650 2700 50  0001 C CNN "Mouser"
 	1    1650 2700
 	1    0    0    -1  
 $EndComp
@@ -74,8 +75,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R94"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R118"  Part="1" 
 F 0 "R118" H 1680 3170 50  0000 L CNN
 F 1 "10kR" H 1680 3110 50  0000 L CNN
-F 2 "" H 1650 3150 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 3150 50  0001 C CNN
 F 3 "~" H 1650 3150 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 1650 3150 50  0001 C CNN "Mouser"
 	1    1650 3150
 	1    0    0    -1  
 $EndComp
@@ -101,8 +103,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R98"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R122"  Part="1" 
 F 0 "R122" H 3280 2670 50  0000 L CNN
 F 1 "10kR" H 3280 2610 50  0000 L CNN
-F 2 "" H 3250 2650 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 2650 50  0001 C CNN
 F 3 "~" H 3250 2650 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 3250 2650 50  0001 C CNN "Mouser"
 	1    3250 2650
 	1    0    0    -1  
 $EndComp
@@ -237,8 +240,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C118"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C142"  Part="1" 
 F 0 "C142" H 1310 3970 50  0000 L CNN
 F 1 "0.1 uF" H 1310 3820 50  0000 L CNN
-F 2 "" H 1300 3900 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1300 3900 50  0001 C CNN
 F 3 "~" H 1300 3900 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 1300 3900 50  0001 C CNN "Mouser"
 	1    1300 3900
 	1    0    0    -1  
 $EndComp
@@ -269,8 +273,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R102"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R126"  Part="1" 
 F 0 "R126" H 6180 2020 50  0000 L CNN
 F 1 "100R" H 6180 1960 50  0000 L CNN
-F 2 "" H 6150 2000 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 2000 50  0001 C CNN
 F 3 "~" H 6150 2000 50  0001 C CNN
+F 4 " 667-ERJ-U02D1000X " H 6150 2000 50  0001 C CNN "Mouser"
 	1    6150 2000
 	1    0    0    -1  
 $EndComp
@@ -282,8 +287,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R105"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R129"  Part="1" 
 F 0 "R129" H 6980 2020 50  0000 L CNN
 F 1 "100R" H 6980 1960 50  0000 L CNN
-F 2 "" H 6950 2000 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 2000 50  0001 C CNN
 F 3 "~" H 6950 2000 50  0001 C CNN
+F 4 " 667-ERJ-U02D1000X " H 6950 2000 50  0001 C CNN "Mouser"
 	1    6950 2000
 	1    0    0    -1  
 $EndComp
@@ -295,8 +301,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R100"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R124"  Part="1" 
 F 0 "R124" H 5780 2470 50  0000 L CNN
 F 1 "10kR" H 5780 2410 50  0000 L CNN
-F 2 "" H 5750 2450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2450 50  0001 C CNN
 F 3 "~" H 5750 2450 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 5750 2450 50  0001 C CNN "Mouser"
 	1    5750 2450
 	1    0    0    -1  
 $EndComp
@@ -308,8 +315,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R101"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R125"  Part="1" 
 F 0 "R125" H 5780 2920 50  0000 L CNN
 F 1 "10kR" H 5780 2860 50  0000 L CNN
-F 2 "" H 5750 2900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2900 50  0001 C CNN
 F 3 "~" H 5750 2900 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 5750 2900 50  0001 C CNN "Mouser"
 	1    5750 2900
 	1    0    0    -1  
 $EndComp
@@ -321,8 +329,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R108"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R132"  Part="1" 
 F 0 "R132" H 7380 2920 50  0000 L CNN
 F 1 "10kR" H 7380 2860 50  0000 L CNN
-F 2 "" H 7350 2900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2900 50  0001 C CNN
 F 3 "~" H 7350 2900 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7350 2900 50  0001 C CNN "Mouser"
 	1    7350 2900
 	1    0    0    -1  
 $EndComp
@@ -334,8 +343,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R107"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R131"  Part="1" 
 F 0 "R131" H 7380 2420 50  0000 L CNN
 F 1 "10kR" H 7380 2360 50  0000 L CNN
-F 2 "" H 7350 2400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2400 50  0001 C CNN
 F 3 "~" H 7350 2400 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7350 2400 50  0001 C CNN "Mouser"
 	1    7350 2400
 	1    0    0    -1  
 $EndComp
@@ -507,8 +517,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C126"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C150"  Part="1" 
 F 0 "C150" H 4510 2720 50  0000 L CNN
 F 1 "0.1 uF" H 4510 2570 50  0000 L CNN
-F 2 "" H 4500 2650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 2650 50  0001 C CNN
 F 3 "~" H 4500 2650 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4500 2650 50  0001 C CNN "Mouser"
 	1    4500 2650
 	0    1    -1   0   
 $EndComp
@@ -522,8 +533,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C131"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C155"  Part="1" 
 F 0 "C155" H 8760 2620 50  0000 L CNN
 F 1 "0.1 uF" H 8760 2470 50  0000 L CNN
-F 2 "" H 8750 2550 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 8750 2550 50  0001 C CNN
 F 3 "~" H 8750 2550 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 8750 2550 50  0001 C CNN "Mouser"
 	1    8750 2550
 	0    -1   -1   0   
 $EndComp
@@ -659,8 +671,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C127"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C151"  Part="1" 
 F 0 "C151" H 4560 2920 50  0000 L CNN
 F 1 "0.1 uF" H 4560 2770 50  0000 L CNN
-F 2 "" H 4550 2850 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4550 2850 50  0001 C CNN
 F 3 "~" H 4550 2850 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4550 2850 50  0001 C CNN "Mouser"
 	1    4550 2850
 	0    1    1    0   
 $EndComp
@@ -680,8 +693,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C132"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C156"  Part="1" 
 F 0 "C156" H 8860 2820 50  0000 L CNN
 F 1 "0.1 uF" H 8860 2670 50  0000 L CNN
-F 2 "" H 8850 2750 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 8850 2750 50  0001 C CNN
 F 3 "~" H 8850 2750 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 8850 2750 50  0001 C CNN "Mouser"
 	1    8850 2750
 	0    -1   1    0   
 $EndComp
@@ -775,8 +789,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C120"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C144"  Part="1" 
 F 0 "C144" H 3060 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3060 5620 50  0000 L CNN
-F 2 "" H 3050 5700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3050 5700 50  0001 C CNN
 F 3 "~" H 3050 5700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 3050 5700 50  0001 C CNN "Mouser"
 	1    3050 5700
 	1    0    0    -1  
 $EndComp
@@ -788,8 +803,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C121"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C145"  Part="1" 
 F 0 "C145" H 3560 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3560 5620 50  0000 L CNN
-F 2 "" H 3550 5700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3550 5700 50  0001 C CNN
 F 3 "~" H 3550 5700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 3550 5700 50  0001 C CNN "Mouser"
 	1    3550 5700
 	1    0    0    -1  
 $EndComp
@@ -801,8 +817,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C123"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C147"  Part="1" 
 F 0 "C147" H 4010 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4010 5620 50  0000 L CNN
-F 2 "" H 4000 5700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4000 5700 50  0001 C CNN
 F 3 "~" H 4000 5700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4000 5700 50  0001 C CNN "Mouser"
 	1    4000 5700
 	1    0    0    -1  
 $EndComp
@@ -814,8 +831,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C125"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C149"  Part="1" 
 F 0 "C149" H 4460 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4460 5620 50  0000 L CNN
-F 2 "" H 4450 5700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 5700 50  0001 C CNN
 F 3 "~" H 4450 5700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4450 5700 50  0001 C CNN "Mouser"
 	1    4450 5700
 	1    0    0    -1  
 $EndComp
@@ -1212,8 +1230,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C122"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C146"  Part="1" 
 F 0 "C146" H 3660 2020 50  0000 L CNN
 F 1 "0.1 uF" H 3660 1870 50  0000 L CNN
-F 2 "" H 3650 1950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3650 1950 50  0001 C CNN
 F 3 "~" H 3650 1950 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 3650 1950 50  0001 C CNN "Mouser"
 	1    3650 1950
 	1    0    0    -1  
 $EndComp
@@ -1225,8 +1244,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C124"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C148"  Part="1" 
 F 0 "C148" H 4110 2020 50  0000 L CNN
 F 1 "0.1 uF" H 4110 1870 50  0000 L CNN
-F 2 "" H 4100 1950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4100 1950 50  0001 C CNN
 F 3 "~" H 4100 1950 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4100 1950 50  0001 C CNN "Mouser"
 	1    4100 1950
 	1    0    0    -1  
 $EndComp
@@ -1275,8 +1295,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C129"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C153"  Part="1" 
 F 0 "C153" H 7860 1770 50  0000 L CNN
 F 1 "0.1 uF" H 7860 1620 50  0000 L CNN
-F 2 "" H 7850 1700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 7850 1700 50  0001 C CNN
 F 3 "~" H 7850 1700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 7850 1700 50  0001 C CNN "Mouser"
 	1    7850 1700
 	1    0    0    -1  
 $EndComp
@@ -1288,8 +1309,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C130"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C154"  Part="1" 
 F 0 "C154" H 8310 1770 50  0000 L CNN
 F 1 "0.1 uF" H 8310 1620 50  0000 L CNN
-F 2 "" H 8300 1700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 8300 1700 50  0001 C CNN
 F 3 "~" H 8300 1700 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 8300 1700 50  0001 C CNN "Mouser"
 	1    8300 1700
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/lna.sch b/pcb/discrete/discrete-rf-board/lna.sch
index f31a5f9..3cfb5d5 100644
--- a/pcb/discrete/discrete-rf-board/lna.sch
+++ b/pcb/discrete/discrete-rf-board/lna.sch
@@ -125,10 +125,10 @@ Wire Wire Line
 Wire Wire Line
 	2450 3650 2550 3650
 $Comp
-L power:GND #PWR0192
+L power:GND #PWR0189
 U 1 1 5D1AE626
 P 3000 4150
-F 0 "#PWR0192" H 3000 3900 50  0001 C CNN
+F 0 "#PWR0189" H 3000 3900 50  0001 C CNN
 F 1 "GND" H 3000 4000 50  0000 C CNN
 F 2 "" H 3000 4150 50  0001 C CNN
 F 3 "" H 3000 4150 50  0001 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 3000 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0193
+L power:GND #PWR0190
 U 1 1 5D1AE8E4
 P 3400 4150
-F 0 "#PWR0193" H 3400 3900 50  0001 C CNN
+F 0 "#PWR0190" H 3400 3900 50  0001 C CNN
 F 1 "GND" H 3400 4000 50  0000 C CNN
 F 2 "" H 3400 4150 50  0001 C CNN
 F 3 "" H 3400 4150 50  0001 C CNN
@@ -153,10 +153,10 @@ Wire Wire Line
 Text Notes 2950 3200 0    50   ~ 0
 902-928 MHz BPF
 $Comp
-L Device:R_Small R133
+L Device:R_Small R137
 U 1 1 5D1B2D1C
 P 3900 4250
-F 0 "R133" H 3930 4270 50  0000 L CNN
+F 0 "R137" H 3930 4270 50  0000 L CNN
 F 1 "10kR" H 3930 4210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3900 4250 50  0001 C CNN
 F 3 "~" H 3900 4250 50  0001 C CNN
@@ -165,10 +165,10 @@ F 4 "603-AC0402FR-1310KL" H 3900 4250 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R134
+L Device:R_Small R138
 U 1 1 5D1B32F5
 P 6900 4250
-F 0 "R134" H 6930 4270 50  0000 L CNN
+F 0 "R138" H 6930 4270 50  0000 L CNN
 F 1 "10kR" H 6930 4210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6900 4250 50  0001 C CNN
 F 3 "~" H 6900 4250 50  0001 C CNN
@@ -186,10 +186,10 @@ Connection ~ 3900 3950
 Wire Wire Line
 	3900 3950 4050 3950
 $Comp
-L power:GND #PWR0194
+L power:GND #PWR0191
 U 1 1 5D1B4BA9
 P 3900 4500
-F 0 "#PWR0194" H 3900 4250 50  0001 C CNN
+F 0 "#PWR0191" H 3900 4250 50  0001 C CNN
 F 1 "GND" H 3900 4350 50  0000 C CNN
 F 2 "" H 3900 4500 50  0001 C CNN
 F 3 "" H 3900 4500 50  0001 C CNN
@@ -212,10 +212,10 @@ Connection ~ 6900 3950
 Wire Wire Line
 	6900 3950 7000 3950
 $Comp
-L power:GND #PWR0196
+L power:GND #PWR0193
 U 1 1 5D1B5E5F
 P 6900 4500
-F 0 "#PWR0196" H 6900 4250 50  0001 C CNN
+F 0 "#PWR0193" H 6900 4250 50  0001 C CNN
 F 1 "GND" H 6900 4350 50  0000 C CNN
 F 2 "" H 6900 4500 50  0001 C CNN
 F 3 "" H 6900 4500 50  0001 C CNN
@@ -273,10 +273,10 @@ F 4 " 571-2337019-1" H 7150 2100 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0197
+L power:GND #PWR0194
 U 1 1 5D1BD3CE
 P 7150 2400
-F 0 "#PWR0197" H 7150 2150 50  0001 C CNN
+F 0 "#PWR0194" H 7150 2150 50  0001 C CNN
 F 1 "GND" H 7150 2250 50  0000 C CNN
 F 2 "" H 7150 2400 50  0001 C CNN
 F 3 "" H 7150 2400 50  0001 C CNN
@@ -284,10 +284,10 @@ F 3 "" H 7150 2400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0198
+L power:GND #PWR0195
 U 1 1 5D1BDEF3
 P 8800 4750
-F 0 "#PWR0198" H 8800 4500 50  0001 C CNN
+F 0 "#PWR0195" H 8800 4500 50  0001 C CNN
 F 1 "GND" H 8800 4600 50  0000 C CNN
 F 2 "" H 8800 4750 50  0001 C CNN
 F 3 "" H 8800 4750 50  0001 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 8800 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0195
+L power:GND #PWR0192
 U 1 1 5D1BE3A6
 P 5750 4800
-F 0 "#PWR0195" H 5750 4550 50  0001 C CNN
+F 0 "#PWR0192" H 5750 4550 50  0001 C CNN
 F 1 "GND" H 5750 4650 50  0000 C CNN
 F 2 "" H 5750 4800 50  0001 C CNN
 F 3 "" H 5750 4800 50  0001 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 5750 4800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0191
+L power:GND #PWR0188
 U 1 1 5D1BE863
 P 2850 4900
-F 0 "#PWR0191" H 2850 4650 50  0001 C CNN
+F 0 "#PWR0188" H 2850 4650 50  0001 C CNN
 F 1 "GND" H 2850 4750 50  0000 C CNN
 F 2 "" H 2850 4900 50  0001 C CNN
 F 3 "" H 2850 4900 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lna.sch-bak b/pcb/discrete/discrete-rf-board/lna.sch-bak
index e6cae9d..f31a5f9 100644
--- a/pcb/discrete/discrete-rf-board/lna.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lna.sch-bak
@@ -158,8 +158,9 @@ U 1 1 5D1B2D1C
 P 3900 4250
 F 0 "R133" H 3930 4270 50  0000 L CNN
 F 1 "10kR" H 3930 4210 50  0000 L CNN
-F 2 "" H 3900 4250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3900 4250 50  0001 C CNN
 F 3 "~" H 3900 4250 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 3900 4250 50  0001 C CNN "Mouser"
 	1    3900 4250
 	1    0    0    -1  
 $EndComp
@@ -169,8 +170,9 @@ U 1 1 5D1B32F5
 P 6900 4250
 F 0 "R134" H 6930 4270 50  0000 L CNN
 F 1 "10kR" H 6930 4210 50  0000 L CNN
-F 2 "" H 6900 4250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 6900 4250 50  0001 C CNN
 F 3 "~" H 6900 4250 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 6900 4250 50  0001 C CNN "Mouser"
 	1    6900 4250
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/lna_gain_block.sch b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
index e444b81..4e9e80a 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 14 19
+Sheet 16 19
 Title ""
 Date ""
 Rev ""
@@ -19,12 +19,12 @@ L Device:R_Small R?
 U 1 1 5D3CF638
 P 6100 3450
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF638" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF638" Ref="R138"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF638" Ref="R143"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R142"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R146"  Part="1" 
-F 0 "R138" H 6041 3404 50  0000 R CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R148"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R153"  Part="1" 
+F 0 "R153" H 6041 3404 50  0000 R CNN
 F 1 "TBD 0402" H 6041 3495 50  0000 R CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
@@ -40,9 +40,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF640" Ref="C167"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C178"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C189"  Part="1" 
-F 0 "C167" V 7679 3250 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C179"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C191"  Part="1" 
+F 0 "C191" V 7679 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7588 3250 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7450 3250 50  0001 C CNN
 F 3 "~" H 7450 3250 50  0001 C CNN
@@ -60,12 +60,12 @@ L power:GND #PWR?
 U 1 1 5D3CF649
 P 4500 4050
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF649" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF649" Ref="#PWR0201"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF649" Ref="#PWR0200"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0214"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR0227"  Part="1" 
-F 0 "#PWR0201" H 4500 3800 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR0228"  Part="1" 
+F 0 "#PWR0228" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -79,12 +79,12 @@ L power:GND #PWR?
 U 1 1 5D3CF650
 P 6700 3800
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF650" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF650" Ref="#PWR0211"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF650" Ref="#PWR0209"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0224"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0223"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR0237"  Part="1" 
-F 0 "#PWR0211" H 6700 3550 50  0001 C CNN
+F 0 "#PWR0237" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -104,9 +104,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF668" Ref="C166"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C177"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C188"  Part="1" 
-F 0 "C166" H 6792 3696 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C178"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C190"  Part="1" 
+F 0 "C190" H 6792 3696 50  0000 L CNN
 F 1 "TBD 0402" H 6792 3605 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
@@ -121,12 +121,12 @@ L Device:L_Small L?
 U 1 1 5D3CF670
 P 6300 3250
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF670" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF670" Ref="L29"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF670" Ref="L32"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L32"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L35"  Part="1" 
-F 0 "L29" V 6485 3250 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L38"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L44"  Part="1" 
+F 0 "L44" V 6485 3250 50  0000 C CNN
 F 1 "TBD 0402" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -138,12 +138,12 @@ L Device:C_Small C?
 U 1 1 5D3CF693
 P 3700 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF693" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF693" Ref="C158"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF693" Ref="C157"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C169"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C180"  Part="1" 
-F 0 "C158" V 3929 3700 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C181"  Part="1" 
+F 0 "C181" V 3929 3700 50  0000 C CNN
 F 1 "100 pF RF" V 3838 3700 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3700 3700 50  0001 C CNN
 F 3 "~" H 3700 3700 50  0001 C CNN
@@ -156,12 +156,12 @@ L Device:L_Small L?
 U 1 1 5D3CF699
 P 4700 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF699" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF699" Ref="L27"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF699" Ref="L29"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L30"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L33"  Part="1" 
-F 0 "L27" V 4885 3700 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L35"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L41"  Part="1" 
+F 0 "L41" V 4885 3700 50  0000 C CNN
 F 1 "TBD 0402" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
@@ -176,9 +176,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF69F" Ref="C160"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C171"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C182"  Part="1" 
-F 0 "C160" H 4592 3946 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C172"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C184"  Part="1" 
+F 0 "C184" H 4592 3946 50  0000 L CNN
 F 1 "TBD 0402" H 4592 3855 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
@@ -191,12 +191,12 @@ L power:GND #PWR?
 U 1 1 5D3CF6A6
 P 5550 4050
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF6A6" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF6A6" Ref="#PWR0208"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF6A6" Ref="#PWR0206"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0221"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0220"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR0234"  Part="1" 
-F 0 "#PWR0208" H 5550 3800 50  0001 C CNN
+F 0 "#PWR0234" H 5550 3800 50  0001 C CNN
 F 1 "GND" H 5555 3877 50  0000 C CNN
 F 2 "" H 5550 4050 50  0001 C CNN
 F 3 "" H 5550 4050 50  0001 C CNN
@@ -211,9 +211,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B01" Ref="C159"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C170"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C181"  Part="1" 
-F 0 "C159" H 4410 2620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C171"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C183"  Part="1" 
+F 0 "C183" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -228,9 +228,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B07" Ref="C162"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C173"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C184"  Part="1" 
-F 0 "C162" H 4810 2620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C174"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C186"  Part="1" 
+F 0 "C186" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -246,9 +246,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B0D" Ref="C164"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C175"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C186"  Part="1" 
-F 0 "C164" H 5210 2620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C176"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C188"  Part="1" 
+F 0 "C188" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -261,12 +261,12 @@ L power:GND #PWR?
 U 1 1 5D3E5B13
 P 4400 2750
 AR Path="/5CA6B0AA/5CE74EBE/5D3E5B13" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B13" Ref="#PWR0200"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B13" Ref="#PWR0199"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0213"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR0226"  Part="1" 
-F 0 "#PWR0200" H 4400 2500 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR0227"  Part="1" 
+F 0 "#PWR0227" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -278,12 +278,12 @@ L power:GND #PWR?
 U 1 1 5D3E5B19
 P 4800 2750
 AR Path="/5CA6B0AA/5CE74EBE/5D3E5B19" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B19" Ref="#PWR0203"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B19" Ref="#PWR0202"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0216"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR0229"  Part="1" 
-F 0 "#PWR0203" H 4800 2500 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR0230"  Part="1" 
+F 0 "#PWR0230" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -295,12 +295,12 @@ L power:GND #PWR?
 U 1 1 5D3E5B1F
 P 5200 2750
 AR Path="/5CA6B0AA/5CE74EBE/5D3E5B1F" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B1F" Ref="#PWR0207"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B1F" Ref="#PWR0205"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0220"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0219"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR0233"  Part="1" 
-F 0 "#PWR0207" H 5200 2500 50  0001 C CNN
+F 0 "#PWR0233" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -315,9 +315,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B25" Ref="C163"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C174"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C185"  Part="1" 
-F 0 "C163" H 5160 1920 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C175"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C187"  Part="1" 
+F 0 "C187" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -330,12 +330,12 @@ L power:GND #PWR?
 U 1 1 5D3E5B2B
 P 5150 2050
 AR Path="/5CA6B0AA/5CE74EBE/5D3E5B2B" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B2B" Ref="#PWR0206"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B2B" Ref="#PWR0204"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0219"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0218"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR0232"  Part="1" 
-F 0 "#PWR0206" H 5150 1800 50  0001 C CNN
+F 0 "#PWR0232" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -350,9 +350,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B31" Ref="C161"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C172"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C183"  Part="1" 
-F 0 "C161" H 4760 1920 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C173"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C185"  Part="1" 
+F 0 "C185" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -364,12 +364,12 @@ L power:GND #PWR?
 U 1 1 5D3E5B37
 P 4750 2050
 AR Path="/5CA6B0AA/5CE74EBE/5D3E5B37" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B37" Ref="#PWR0202"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3E5B37" Ref="#PWR0201"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0215"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR0228"  Part="1" 
-F 0 "#PWR0202" H 4750 1800 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR0229"  Part="1" 
+F 0 "#PWR0229" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
@@ -420,15 +420,15 @@ Wire Wire Line
 Wire Wire Line
 	7550 3250 8050 3250
 $Comp
-L Device:R_Small R137
+L Device:R_Small R142
 U 1 1 5D3F1C48
 P 5550 2100
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3F1C48" Ref="R137"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3F1C48" Ref="R142"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R141"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R145"  Part="1" 
-F 0 "R137" H 5580 2120 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R147"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R152"  Part="1" 
+F 0 "R152" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -448,12 +448,12 @@ L Device:C_Small C?
 U 1 1 5D3FEB6E
 P 4000 2550
 AR Path="/5CA6B0AA/5CE74EBE/5D3FEB6E" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3FEB6E" Ref="C157"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3FEB6E" Ref="C158"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C168"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C179"  Part="1" 
-F 0 "C157" H 4010 2620 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C170"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C182"  Part="1" 
+F 0 "C182" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -465,12 +465,12 @@ L power:GND #PWR?
 U 1 1 5D3FEB74
 P 4000 2750
 AR Path="/5CA6B0AA/5CE74EBE/5D3FEB74" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3FEB74" Ref="#PWR0199"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3FEB74" Ref="#PWR0198"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0212"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR0225"  Part="1" 
-F 0 "#PWR0199" H 4000 2500 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR0226"  Part="1" 
+F 0 "#PWR0226" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -484,13 +484,13 @@ Wire Wire Line
 Wire Wire Line
 	4000 2350 4400 2350
 $Comp
-L Device:L_Small L28
+L Device:L_Small L31
 U 1 1 5D40D244
 P 5550 3050
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L28"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L31"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L34"  Part="1" 
-F 0 "L28" H 5580 3090 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L31"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L37"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L43"  Part="1" 
+F 0 "L43" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -515,9 +515,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D1F8CDE" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D1F8CDE" Ref="C165"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1F8CDE" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1F8CDE" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1F8CDE" Ref="C176"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1F8CDE" Ref="C187"  Part="1" 
-F 0 "C165" H 6192 4046 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1F8CDE" Ref="C177"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1F8CDE" Ref="C189"  Part="1" 
+F 0 "C189" H 6192 4046 50  0000 L CNN
 F 1 "100 pF RF" H 6192 3955 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6100 4000 50  0001 C CNN
 F 3 "~" H 6100 4000 50  0001 C CNN
@@ -536,12 +536,12 @@ L power:GND #PWR?
 U 1 1 5D1FE4A0
 P 6100 4200
 AR Path="/5CA6B0AA/5CE74EBE/5D1FE4A0" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D1FE4A0" Ref="#PWR0210"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D1FE4A0" Ref="#PWR0208"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1FE4A0" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1FE4A0" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1FE4A0" Ref="#PWR0223"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1FE4A0" Ref="#PWR0222"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1FE4A0" Ref="#PWR0236"  Part="1" 
-F 0 "#PWR0210" H 6100 3950 50  0001 C CNN
+F 0 "#PWR0236" H 6100 3950 50  0001 C CNN
 F 1 "GND" H 6105 4027 50  0000 C CNN
 F 2 "" H 6100 4200 50  0001 C CNN
 F 3 "" H 6100 4200 50  0001 C CNN
@@ -565,7 +565,7 @@ P 5900 2650
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FE9AD" Ref="J25"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FE9AD" Ref="J29"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FE9AD" Ref="J27"  Part="1" 
-F 0 "J25" H 5910 2770 50  0000 C CNN
+F 0 "J29" H 5910 2770 50  0000 C CNN
 F 1 "UFL" V 6015 2650 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5900 2650 50  0001 C CNN
 F 3 " ~" H 5900 2650 50  0001 C CNN
@@ -580,7 +580,7 @@ P 5000 4000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FF402" Ref="J24"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FF402" Ref="J28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FF402" Ref="J26"  Part="1" 
-F 0 "J24" H 5010 4120 50  0000 C CNN
+F 0 "J28" H 5010 4120 50  0000 C CNN
 F 1 "UFL" V 5115 4000 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5000 4000 50  0001 C CNN
 F 3 " ~" H 5000 4000 50  0001 C CNN
@@ -600,13 +600,13 @@ Connection ~ 5100 3700
 Wire Wire Line
 	5100 3700 5200 3700
 $Comp
-L power:GND #PWR0205
+L power:GND #PWR0203
 U 1 1 5D9050FA
 P 5000 4300
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9050FA" Ref="#PWR0205"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9050FA" Ref="#PWR0203"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9050FA" Ref="#PWR0231"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9050FA" Ref="#PWR0218"  Part="1" 
-F 0 "#PWR0205" H 5000 4050 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9050FA" Ref="#PWR0217"  Part="1" 
+F 0 "#PWR0231" H 5000 4050 50  0001 C CNN
 F 1 "GND" H 5000 4150 50  0000 C CNN
 F 2 "" H 5000 4300 50  0001 C CNN
 F 3 "" H 5000 4300 50  0001 C CNN
@@ -623,13 +623,13 @@ Connection ~ 5650 3250
 Wire Wire Line
 	5650 3250 6100 3250
 $Comp
-L power:GND #PWR0209
+L power:GND #PWR0207
 U 1 1 5D90C0F7
 P 5900 2950
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D90C0F7" Ref="#PWR0209"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D90C0F7" Ref="#PWR0207"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D90C0F7" Ref="#PWR0235"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D90C0F7" Ref="#PWR0222"  Part="1" 
-F 0 "#PWR0209" H 5900 2700 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D90C0F7" Ref="#PWR0221"  Part="1" 
+F 0 "#PWR0235" H 5900 2700 50  0001 C CNN
 F 1 "GND" H 5900 2800 50  0000 C CNN
 F 2 "" H 5900 2950 50  0001 C CNN
 F 3 "" H 5900 2950 50  0001 C CNN
@@ -639,13 +639,13 @@ $EndComp
 Wire Wire Line
 	5900 2950 5900 2850
 $Comp
-L discrete-parts:Q_NPN_CBEE Q15
+L discrete-parts:Q_NPN_CBEE Q26
 U 1 1 5DA42F7F
 P 5500 3700
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA42F7F" Ref="Q15"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA42F7F" Ref="Q13"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA42F7F" Ref="Q14"  Part="1" 
-F 0 "Q13" H 5800 3700 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA42F7F" Ref="Q26"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA42F7F" Ref="Q22"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA42F7F" Ref="Q24"  Part="1" 
+F 0 "Q26" H 5800 3700 50  0000 C CNN
 F 1 "BFU520R" H 5700 3600 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
@@ -656,13 +656,13 @@ $EndComp
 Wire Wire Line
 	4800 3700 5100 3700
 $Comp
-L Device:Q_PNP_BCE Q16
+L Device:Q_PNP_BCE Q21
 U 1 1 5D9A76B1
 P 4600 3250
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9A76B1" Ref="Q16"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9A76B1" Ref="Q17"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9A76B1" Ref="Q18"  Part="1" 
-F 0 "Q16" H 4800 3300 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9A76B1" Ref="Q21"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9A76B1" Ref="Q23"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9A76B1" Ref="Q25"  Part="1" 
+F 0 "Q25" H 4800 3300 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 4800 3200 50  0000 L CNN
 F 2 "" H 4800 3350 50  0001 C CNN
 F 3 "~" H 4600 3250 50  0001 C CNN
@@ -670,13 +670,13 @@ F 3 "~" H 4600 3250 50  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L Device:L_Small L43
+L Device:L_Small L30
 U 1 1 5D9B3DB2
 P 5050 3550
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9B3DB2" Ref="L43"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B3DB2" Ref="L44"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B3DB2" Ref="L45"  Part="1" 
-F 0 "L43" H 5080 3590 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9B3DB2" Ref="L30"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B3DB2" Ref="L36"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B3DB2" Ref="L42"  Part="1" 
+F 0 "L42" H 5080 3590 50  0000 L CNN
 F 1 "220 nH" H 5080 3510 50  0000 L CNN
 F 2 "" H 5050 3550 50  0001 C CNN
 F 3 "~" H 5050 3550 50  0001 C CNN
@@ -695,15 +695,15 @@ Wire Wire Line
 Wire Wire Line
 	4700 3550 4950 3550
 $Comp
-L Device:R_Small R139
+L Device:R_Small R141
 U 1 1 5D9B8D00
 P 5000 3050
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9B8D00" Ref="R139"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9B8D00" Ref="R141"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D9B8D00" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D9B8D00" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B8D00" Ref="R144"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B8D00" Ref="R164"  Part="1" 
-F 0 "R139" H 5030 3070 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B8D00" Ref="R146"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B8D00" Ref="R151"  Part="1" 
+F 0 "R151" H 5030 3070 50  0000 L CNN
 F 1 "10kR" H 5030 3010 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5000 3050 50  0001 C CNN
 F 3 "~" H 5000 3050 50  0001 C CNN
@@ -716,13 +716,13 @@ Wire Wire Line
 Wire Wire Line
 	4900 3050 4700 3050
 $Comp
-L Device:R_Small R135
+L Device:R_Small R139
 U 1 1 5D9BD9BD
 P 3500 2700
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BD9BD" Ref="R135"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BD9BD" Ref="R140"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BD9BD" Ref="R162"  Part="1" 
-F 0 "R135" H 3530 2720 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BD9BD" Ref="R139"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BD9BD" Ref="R144"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BD9BD" Ref="R149"  Part="1" 
+F 0 "R149" H 3530 2720 50  0000 L CNN
 F 1 "TBD 0402" H 3530 2660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3500 2700 50  0001 C CNN
 F 3 "~" H 3500 2700 50  0001 C CNN
@@ -731,13 +731,13 @@ F 4 "NoPart" H 3500 2700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R136
+L Device:R_Small R140
 U 1 1 5D9BE9E2
 P 3500 3000
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BE9E2" Ref="R136"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BE9E2" Ref="R143"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BE9E2" Ref="R163"  Part="1" 
-F 0 "R136" H 3530 3020 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BE9E2" Ref="R140"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BE9E2" Ref="R145"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BE9E2" Ref="R150"  Part="1" 
+F 0 "R150" H 3530 3020 50  0000 L CNN
 F 1 "TBD 0402" H 3530 2960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3500 3000 50  0001 C CNN
 F 3 "~" H 3500 3000 50  0001 C CNN
@@ -746,13 +746,13 @@ F 4 "NoPart" H 3500 3000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0217
+L power:GND #PWR0197
 U 1 1 5D9BF2FE
 P 3500 3200
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BF2FE" Ref="#PWR0217"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BF2FE" Ref="#PWR0261"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BF2FE" Ref="#PWR0263"  Part="1" 
-F 0 "#PWR0217" H 3500 2950 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BF2FE" Ref="#PWR0197"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BF2FE" Ref="#PWR0211"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BF2FE" Ref="#PWR0225"  Part="1" 
+F 0 "#PWR0225" H 3500 2950 50  0001 C CNN
 F 1 "GND" H 3500 3050 50  0000 C CNN
 F 2 "" H 3500 3200 50  0001 C CNN
 F 3 "" H 3500 3200 50  0001 C CNN
@@ -772,12 +772,12 @@ L Device:C_Small C?
 U 1 1 5D9CB46C
 P 3200 3000
 AR Path="/5CA6B0AA/5CE74EBE/5D9CB46C" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CB46C" Ref="C212"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CB46C" Ref="C156"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D9CB46C" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D9CB46C" Ref="C?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CB46C" Ref="C213"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CB46C" Ref="C214"  Part="1" 
-F 0 "C212" H 3210 3070 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CB46C" Ref="C168"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CB46C" Ref="C180"  Part="1" 
+F 0 "C180" H 3210 3070 50  0000 L CNN
 F 1 "1 uF" H 3210 2920 50  0000 L CNN
 F 2 "" H 3200 3000 50  0001 C CNN
 F 3 "~" H 3200 3000 50  0001 C CNN
@@ -785,13 +785,13 @@ F 3 "~" H 3200 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0204
+L power:GND #PWR0196
 U 1 1 5D9CBE0E
 P 3200 3150
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CBE0E" Ref="#PWR0204"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CBE0E" Ref="#PWR0230"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CBE0E" Ref="#PWR0262"  Part="1" 
-F 0 "#PWR0204" H 3200 2900 50  0001 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CBE0E" Ref="#PWR0196"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CBE0E" Ref="#PWR0210"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CBE0E" Ref="#PWR0224"  Part="1" 
+F 0 "#PWR0224" H 3200 2900 50  0001 C CNN
 F 1 "GND" H 3200 3000 50  0000 C CNN
 F 2 "" H 3200 3150 50  0001 C CNN
 F 3 "" H 3200 3150 50  0001 C CNN
@@ -818,12 +818,12 @@ L Device:L_Small L?
 U 1 1 5D9F5768
 P 7000 3250
 AR Path="/5CA6B0AA/5CE74EBE/5D9F5768" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9F5768" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9F5768" Ref="L33"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D9F5768" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D9F5768" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9F5768" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9F5768" Ref="L?"  Part="1" 
-F 0 "L?" V 7185 3250 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9F5768" Ref="L39"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9F5768" Ref="L45"  Part="1" 
+F 0 "L45" V 7185 3250 50  0000 C CNN
 F 1 "TBD 0402" V 7094 3250 50  0000 C CNN
 F 2 "" H 7000 3250 50  0001 C CNN
 F 3 "~" H 7000 3250 50  0001 C CNN
@@ -843,12 +843,12 @@ L Device:L_Small L?
 U 1 1 5DA1B72A
 P 4150 3700
 AR Path="/5CA6B0AA/5CE74EBE/5DA1B72A" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA1B72A" Ref="L28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DA1B72A" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DA1B72A" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA1B72A" Ref="L?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA1B72A" Ref="L?"  Part="1" 
-F 0 "L?" V 4335 3700 50  0000 C CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA1B72A" Ref="L34"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA1B72A" Ref="L40"  Part="1" 
+F 0 "L40" V 4335 3700 50  0000 C CNN
 F 1 "TBD 0402" V 4244 3700 50  0000 C CNN
 F 2 "" H 4150 3700 50  0001 C CNN
 F 3 "~" H 4150 3700 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak b/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
index 0fbfa61..c56eb87 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 14 19
+Sheet 16 19
 Title ""
 Date ""
 Rev ""
@@ -24,10 +24,11 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R142"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R146"  Part="1" 
-F 0 "R138" H 6041 3404 50  0000 R CNN
+F 0 "R146" H 6041 3404 50  0000 R CNN
 F 1 "TBD 0402" H 6041 3495 50  0000 R CNN
-F 2 "" H 6100 3450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
+F 4 "NoPart" H 6100 3450 50  0001 C CNN "Mouser"
 	1    6100 3450
 	-1   0    0    1   
 $EndComp
@@ -41,7 +42,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C178"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C189"  Part="1" 
-F 0 "C167" V 7679 3250 50  0000 C CNN
+F 0 "C189" V 7679 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7588 3250 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7450 3250 50  0001 C CNN
 F 3 "~" H 7450 3250 50  0001 C CNN
@@ -64,7 +65,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0214"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR0227"  Part="1" 
-F 0 "#PWR0201" H 4500 3800 50  0001 C CNN
+F 0 "#PWR0227" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -83,7 +84,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0224"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR0237"  Part="1" 
-F 0 "#PWR0211" H 6700 3550 50  0001 C CNN
+F 0 "#PWR0237" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -105,10 +106,11 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C177"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C188"  Part="1" 
-F 0 "C166" H 6792 3696 50  0000 L CNN
+F 0 "C188" H 6792 3696 50  0000 L CNN
 F 1 "TBD 0402" H 6792 3605 50  0000 L CNN
-F 2 "" H 6700 3650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 6700 3650 50  0001 C CNN "Mouser"
 	1    6700 3650
 	1    0    0    -1  
 $EndComp
@@ -124,7 +126,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L32"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L35"  Part="1" 
-F 0 "L29" V 6485 3250 50  0000 C CNN
+F 0 "L35" V 6485 3250 50  0000 C CNN
 F 1 "TBD 0402" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -134,19 +136,19 @@ $EndComp
 $Comp
 L Device:C_Small C?
 U 1 1 5D3CF693
-P 4300 3700
+P 3700 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF693" Ref="C158"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C169"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C180"  Part="1" 
-F 0 "C158" V 4529 3700 50  0000 C CNN
-F 1 "100 pF RF" V 4438 3700 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 4300 3700 50  0001 C CNN
-F 3 "~" H 4300 3700 50  0001 C CNN
-F 4 "791-RF15N101J250CT " H 4300 3700 50  0001 C CNN "Mouser"
-	1    4300 3700
+F 0 "C180" V 3929 3700 50  0000 C CNN
+F 1 "100 pF RF" V 3838 3700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3700 3700 50  0001 C CNN
+F 3 "~" H 3700 3700 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 3700 3700 50  0001 C CNN "Mouser"
+	1    3700 3700
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -159,8 +161,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L30"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L33"  Part="1" 
-F 0 "L27" V 4885 3700 50  0000 C CNN
-F 1 "9.5 nH" V 4794 3700 50  0000 C CNN
+F 0 "L33" V 4885 3700 50  0000 C CNN
+F 1 "TBD 0402" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
 	1    4700 3700
@@ -176,10 +178,11 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C171"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C182"  Part="1" 
-F 0 "C160" H 4592 3946 50  0000 L CNN
-F 1 "5.45 pF RF" H 4592 3855 50  0000 L CNN
-F 2 "" H 4500 3900 50  0001 C CNN
+F 0 "C182" H 4592 3946 50  0000 L CNN
+F 1 "TBD 0402" H 4592 3855 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 4500 3900 50  0001 C CNN "Mouser"
 	1    4500 3900
 	-1   0    0    -1  
 $EndComp
@@ -193,7 +196,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0221"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR0234"  Part="1" 
-F 0 "#PWR0208" H 5550 3800 50  0001 C CNN
+F 0 "#PWR0234" H 5550 3800 50  0001 C CNN
 F 1 "GND" H 5555 3877 50  0000 C CNN
 F 2 "" H 5550 4050 50  0001 C CNN
 F 3 "" H 5550 4050 50  0001 C CNN
@@ -210,7 +213,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C170"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C181"  Part="1" 
-F 0 "C159" H 4410 2620 50  0000 L CNN
+F 0 "C181" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -227,7 +230,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C173"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C184"  Part="1" 
-F 0 "C162" H 4810 2620 50  0000 L CNN
+F 0 "C184" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -245,7 +248,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C175"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C186"  Part="1" 
-F 0 "C164" H 5210 2620 50  0000 L CNN
+F 0 "C186" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -263,7 +266,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0213"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR0226"  Part="1" 
-F 0 "#PWR0200" H 4400 2500 50  0001 C CNN
+F 0 "#PWR0226" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -280,7 +283,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0216"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR0229"  Part="1" 
-F 0 "#PWR0203" H 4800 2500 50  0001 C CNN
+F 0 "#PWR0229" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -297,7 +300,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0220"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR0233"  Part="1" 
-F 0 "#PWR0207" H 5200 2500 50  0001 C CNN
+F 0 "#PWR0233" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -314,7 +317,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C174"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C185"  Part="1" 
-F 0 "C163" H 5160 1920 50  0000 L CNN
+F 0 "C185" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -332,7 +335,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0219"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR0232"  Part="1" 
-F 0 "#PWR0206" H 5150 1800 50  0001 C CNN
+F 0 "#PWR0232" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -349,7 +352,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C172"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C183"  Part="1" 
-F 0 "C161" H 4760 1920 50  0000 L CNN
+F 0 "C183" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -366,14 +369,14 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0215"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR0228"  Part="1" 
-F 0 "#PWR0202" H 4750 1800 50  0001 C CNN
+F 0 "#PWR0228" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
 	1    4750 2050
 	1    0    0    -1  
 $EndComp
-Text HLabel 3750 3700 0    50   Input ~ 0
+Text HLabel 3500 3700 0    50   Input ~ 0
 IN
 Text HLabel 8050 3250 2    50   Input ~ 0
 OUT
@@ -413,7 +416,7 @@ Wire Wire Line
 	4750 1650 5150 1650
 Connection ~ 5150 1650
 Wire Wire Line
-	3750 3700 4200 3700
+	3500 3700 3600 3700
 Wire Wire Line
 	7550 3250 8050 3250
 $Comp
@@ -425,7 +428,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R141"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R145"  Part="1" 
-F 0 "R137" H 5580 2120 50  0000 L CNN
+F 0 "R145" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -450,7 +453,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C168"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C179"  Part="1" 
-F 0 "C157" H 4010 2620 50  0000 L CNN
+F 0 "C179" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -467,7 +470,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0212"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR0225"  Part="1" 
-F 0 "#PWR0199" H 4000 2500 50  0001 C CNN
+F 0 "#PWR0225" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -487,7 +490,7 @@ P 5550 3050
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L31"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L34"  Part="1" 
-F 0 "L28" H 5580 3090 50  0000 L CNN
+F 0 "L34" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -514,7 +517,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1F8CDE" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1F8CDE" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1F8CDE" Ref="C176"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1F8CDE" Ref="C187"  Part="1" 
-F 0 "C165" H 6192 4046 50  0000 L CNN
+F 0 "C187" H 6192 4046 50  0000 L CNN
 F 1 "100 pF RF" H 6192 3955 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6100 4000 50  0001 C CNN
 F 3 "~" H 6100 4000 50  0001 C CNN
@@ -538,7 +541,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1FE4A0" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1FE4A0" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1FE4A0" Ref="#PWR0223"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1FE4A0" Ref="#PWR0236"  Part="1" 
-F 0 "#PWR0210" H 6100 3950 50  0001 C CNN
+F 0 "#PWR0236" H 6100 3950 50  0001 C CNN
 F 1 "GND" H 6105 4027 50  0000 C CNN
 F 2 "" H 6100 4200 50  0001 C CNN
 F 3 "" H 6100 4200 50  0001 C CNN
@@ -550,8 +553,6 @@ Wire Wire Line
 Wire Wire Line
 	6200 3250 6100 3250
 Connection ~ 6100 3250
-Wire Wire Line
-	4400 3700 4500 3700
 Wire Wire Line
 	4500 3800 4500 3700
 Connection ~ 4500 3700
@@ -564,7 +565,7 @@ P 5900 2650
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FE9AD" Ref="J25"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FE9AD" Ref="J29"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FE9AD" Ref="J27"  Part="1" 
-F 0 "J25" H 5910 2770 50  0000 C CNN
+F 0 "J29" H 5910 2770 50  0000 C CNN
 F 1 "UFL" V 6015 2650 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5900 2650 50  0001 C CNN
 F 3 " ~" H 5900 2650 50  0001 C CNN
@@ -579,7 +580,7 @@ P 5000 4000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FF402" Ref="J24"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FF402" Ref="J28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FF402" Ref="J26"  Part="1" 
-F 0 "J24" H 5010 4120 50  0000 C CNN
+F 0 "J28" H 5010 4120 50  0000 C CNN
 F 1 "UFL" V 5115 4000 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5000 4000 50  0001 C CNN
 F 3 " ~" H 5000 4000 50  0001 C CNN
@@ -605,7 +606,7 @@ P 5000 4300
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9050FA" Ref="#PWR0205"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9050FA" Ref="#PWR0231"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9050FA" Ref="#PWR0218"  Part="1" 
-F 0 "#PWR0205" H 5000 4050 50  0001 C CNN
+F 0 "#PWR0231" H 5000 4050 50  0001 C CNN
 F 1 "GND" H 5000 4150 50  0000 C CNN
 F 2 "" H 5000 4300 50  0001 C CNN
 F 3 "" H 5000 4300 50  0001 C CNN
@@ -628,7 +629,7 @@ P 5900 2950
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D90C0F7" Ref="#PWR0209"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D90C0F7" Ref="#PWR0235"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D90C0F7" Ref="#PWR0222"  Part="1" 
-F 0 "#PWR0209" H 5900 2700 50  0001 C CNN
+F 0 "#PWR0235" H 5900 2700 50  0001 C CNN
 F 1 "GND" H 5900 2800 50  0000 C CNN
 F 2 "" H 5900 2950 50  0001 C CNN
 F 3 "" H 5900 2950 50  0001 C CNN
@@ -644,7 +645,7 @@ P 5500 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA42F7F" Ref="Q15"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA42F7F" Ref="Q13"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA42F7F" Ref="Q14"  Part="1" 
-F 0 "Q13" H 5800 3700 50  0000 C CNN
+F 0 "Q15" H 5800 3700 50  0000 C CNN
 F 1 "BFU520R" H 5700 3600 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
@@ -661,7 +662,7 @@ P 4600 3250
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9A76B1" Ref="Q16"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9A76B1" Ref="Q17"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9A76B1" Ref="Q18"  Part="1" 
-F 0 "Q16" H 4800 3300 50  0000 L CNN
+F 0 "Q18" H 4800 3300 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 4800 3200 50  0000 L CNN
 F 2 "" H 4800 3350 50  0001 C CNN
 F 3 "~" H 4600 3250 50  0001 C CNN
@@ -675,7 +676,7 @@ P 5050 3550
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9B3DB2" Ref="L43"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B3DB2" Ref="L44"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B3DB2" Ref="L45"  Part="1" 
-F 0 "L43" H 5080 3590 50  0000 L CNN
+F 0 "L45" H 5080 3590 50  0000 L CNN
 F 1 "220 nH" H 5080 3510 50  0000 L CNN
 F 2 "" H 5050 3550 50  0001 C CNN
 F 3 "~" H 5050 3550 50  0001 C CNN
@@ -702,10 +703,11 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D9B8D00" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D9B8D00" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9B8D00" Ref="R144"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9B8D00" Ref="R164"  Part="1" 
-F 0 "R139" H 5030 3070 50  0000 L CNN
+F 0 "R164" H 5030 3070 50  0000 L CNN
 F 1 "10kR" H 5030 3010 50  0000 L CNN
-F 2 "" H 5000 3050 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5000 3050 50  0001 C CNN
 F 3 "~" H 5000 3050 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 5000 3050 50  0001 C CNN "Mouser"
 	1    5000 3050
 	0    -1   -1   0   
 $EndComp
@@ -716,100 +718,92 @@ Wire Wire Line
 $Comp
 L Device:R_Small R135
 U 1 1 5D9BD9BD
-P 3850 3050
+P 3500 2700
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BD9BD" Ref="R135"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BD9BD" Ref="R140"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BD9BD" Ref="R162"  Part="1" 
-F 0 "R135" H 3880 3070 50  0000 L CNN
-F 1 "TBD 0402" H 3880 3010 50  0000 L CNN
-F 2 "" H 3850 3050 50  0001 C CNN
-F 3 "~" H 3850 3050 50  0001 C CNN
-	1    3850 3050
+F 0 "R162" H 3530 2720 50  0000 L CNN
+F 1 "TBD 0402" H 3530 2660 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3500 2700 50  0001 C CNN
+F 3 "~" H 3500 2700 50  0001 C CNN
+F 4 "NoPart" H 3500 2700 50  0001 C CNN "Mouser"
+	1    3500 2700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R_Small R136
 U 1 1 5D9BE9E2
-P 3850 3350
+P 3500 3000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BE9E2" Ref="R136"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BE9E2" Ref="R143"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BE9E2" Ref="R163"  Part="1" 
-F 0 "R136" H 3880 3370 50  0000 L CNN
-F 1 "TBD 0402" H 3880 3310 50  0000 L CNN
-F 2 "" H 3850 3350 50  0001 C CNN
-F 3 "~" H 3850 3350 50  0001 C CNN
-	1    3850 3350
+F 0 "R163" H 3530 3020 50  0000 L CNN
+F 1 "TBD 0402" H 3530 2960 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3500 3000 50  0001 C CNN
+F 3 "~" H 3500 3000 50  0001 C CNN
+F 4 "NoPart" H 3500 3000 50  0001 C CNN "Mouser"
+	1    3500 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0217
 U 1 1 5D9BF2FE
-P 3850 3550
+P 3500 3200
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9BF2FE" Ref="#PWR0217"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9BF2FE" Ref="#PWR0261"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9BF2FE" Ref="#PWR0263"  Part="1" 
-F 0 "#PWR0217" H 3850 3300 50  0001 C CNN
-F 1 "GND" H 3850 3400 50  0000 C CNN
-F 2 "" H 3850 3550 50  0001 C CNN
-F 3 "" H 3850 3550 50  0001 C CNN
-	1    3850 3550
+F 0 "#PWR0263" H 3500 2950 50  0001 C CNN
+F 1 "GND" H 3500 3050 50  0000 C CNN
+F 2 "" H 3500 3200 50  0001 C CNN
+F 3 "" H 3500 3200 50  0001 C CNN
+	1    3500 3200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3850 3550 3850 3450
+	3500 3200 3500 3100
 Wire Wire Line
-	3850 3150 3850 3200
+	3500 2800 3500 2850
+Connection ~ 3500 2850
 Wire Wire Line
-	3850 3200 4250 3200
-Wire Wire Line
-	4250 3200 4250 3250
-Wire Wire Line
-	4250 3250 4400 3250
-Connection ~ 3850 3200
-Wire Wire Line
-	3850 3200 3850 3250
-Wire Wire Line
-	3850 2950 3850 1650
-Wire Wire Line
-	3850 1650 4750 1650
+	3500 2850 3500 2900
 Connection ~ 4750 1650
 $Comp
 L Device:C_Small C?
 U 1 1 5D9CB46C
-P 3550 3350
+P 3200 3000
 AR Path="/5CA6B0AA/5CE74EBE/5D9CB46C" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CB46C" Ref="C212"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D9CB46C" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D9CB46C" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CB46C" Ref="C213"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CB46C" Ref="C214"  Part="1" 
-F 0 "C212" H 3560 3420 50  0000 L CNN
-F 1 "1 uF" H 3560 3270 50  0000 L CNN
-F 2 "" H 3550 3350 50  0001 C CNN
-F 3 "~" H 3550 3350 50  0001 C CNN
-	1    3550 3350
+F 0 "C214" H 3210 3070 50  0000 L CNN
+F 1 "1 uF" H 3210 2920 50  0000 L CNN
+F 2 "" H 3200 3000 50  0001 C CNN
+F 3 "~" H 3200 3000 50  0001 C CNN
+	1    3200 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0204
 U 1 1 5D9CBE0E
-P 3550 3500
+P 3200 3150
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9CBE0E" Ref="#PWR0204"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9CBE0E" Ref="#PWR0230"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9CBE0E" Ref="#PWR0262"  Part="1" 
-F 0 "#PWR0204" H 3550 3250 50  0001 C CNN
-F 1 "GND" H 3550 3350 50  0000 C CNN
-F 2 "" H 3550 3500 50  0001 C CNN
-F 3 "" H 3550 3500 50  0001 C CNN
-	1    3550 3500
+F 0 "#PWR0262" H 3200 2900 50  0001 C CNN
+F 1 "GND" H 3200 3000 50  0000 C CNN
+F 2 "" H 3200 3150 50  0001 C CNN
+F 3 "" H 3200 3150 50  0001 C CNN
+	1    3200 3150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3550 3500 3550 3450
+	3200 3150 3200 3100
 Wire Wire Line
-	3550 3250 3550 3200
+	3200 2900 3200 2850
 Wire Wire Line
-	3550 3200 3850 3200
+	3200 2850 3500 2850
 Wire Wire Line
 	5550 3900 5550 4000
 Wire Wire Line
@@ -840,4 +834,35 @@ Wire Wire Line
 	6700 3250 6900 3250
 Wire Wire Line
 	7100 3250 7350 3250
+Wire Wire Line
+	3500 2600 3500 1650
+Wire Wire Line
+	3500 1650 4750 1650
+$Comp
+L Device:L_Small L?
+U 1 1 5DA1B72A
+P 4150 3700
+AR Path="/5CA6B0AA/5CE74EBE/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA1B72A" Ref="L?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA1B72A" Ref="L?"  Part="1" 
+F 0 "L?" V 4335 3700 50  0000 C CNN
+F 1 "TBD 0402" V 4244 3700 50  0000 C CNN
+F 2 "" H 4150 3700 50  0001 C CNN
+F 3 "~" H 4150 3700 50  0001 C CNN
+	1    4150 3700
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	4250 3700 4500 3700
+Wire Wire Line
+	3800 3700 4050 3700
+Wire Wire Line
+	3500 2850 3900 2850
+Wire Wire Line
+	3900 2850 3900 3250
+Wire Wire Line
+	3900 3250 4400 3250
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/lo.sch b/pcb/discrete/discrete-rf-board/lo.sch
index 73e8f9c..3ebc208 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch
+++ b/pcb/discrete/discrete-rf-board/lo.sch
@@ -27,10 +27,10 @@ F 4 " 584-ADF4360-7BCPZR7 " H 3950 3550 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0109
+L power:GND #PWR0105
 U 1 1 5CA891C8
 P 4150 5150
-F 0 "#PWR0109" H 4150 4900 50  0001 C CNN
+F 0 "#PWR0105" H 4150 4900 50  0001 C CNN
 F 1 "GND" H 4150 5000 50  0000 C CNN
 F 2 "" H 4150 5150 50  0001 C CNN
 F 3 "" H 4150 5150 50  0001 C CNN
@@ -93,10 +93,10 @@ F 3 "~" H 2100 4600 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C90
+L Device:C_Small C87
 U 1 1 5CA89672
 P 2800 4600
-F 0 "C90" H 2810 4670 50  0000 L CNN
+F 0 "C87" H 2810 4670 50  0000 L CNN
 F 1 "0.01 uF" H 2810 4520 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2800 4600 50  0001 C CNN
 F 3 "~" H 2800 4600 50  0001 C CNN
@@ -105,10 +105,10 @@ F 4 "80-C0402C103K4R7411" H 2800 4600 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R67
+L Device:R_Small R69
 U 1 1 5CA897E2
 P 2950 5000
-F 0 "R67" H 2980 5020 50  0000 L CNN
+F 0 "R69" H 2980 5020 50  0000 L CNN
 F 1 "4.70kR" H 2980 4960 50  0000 L CNN
 F 2 "" H 2950 5000 50  0001 C CNN
 F 3 "~" H 2950 5000 50  0001 C CNN
@@ -116,10 +116,10 @@ F 3 "~" H 2950 5000 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C91
+L Device:C_Small C88
 U 1 1 5CA89859
 P 3100 5000
-F 0 "C91" H 3110 5070 50  0000 L CNN
+F 0 "C88" H 3110 5070 50  0000 L CNN
 F 1 "10 uF" H 3110 4920 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3100 5000 50  0001 C CNN
 F 3 "~" H 3100 5000 50  0001 C CNN
@@ -128,10 +128,10 @@ F 4 "81-GRM21BC81C106KE5L" H 3100 5000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0106
+L power:GND #PWR0102
 U 1 1 5CA898D7
 P 2800 4750
-F 0 "#PWR0106" H 2800 4500 50  0001 C CNN
+F 0 "#PWR0102" H 2800 4500 50  0001 C CNN
 F 1 "GND" H 2800 4600 50  0000 C CNN
 F 2 "" H 2800 4750 50  0001 C CNN
 F 3 "" H 2800 4750 50  0001 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 2800 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0107
+L power:GND #PWR0103
 U 1 1 5CA8992F
 P 2950 5150
-F 0 "#PWR0107" H 2950 4900 50  0001 C CNN
+F 0 "#PWR0103" H 2950 4900 50  0001 C CNN
 F 1 "GND" H 2950 5000 50  0000 C CNN
 F 2 "" H 2950 5150 50  0001 C CNN
 F 3 "" H 2950 5150 50  0001 C CNN
@@ -208,10 +208,10 @@ Text HLabel 2050 2600 0    50   Input ~ 0
 Wire Wire Line
 	3150 3300 2950 3300
 $Comp
-L power:GND #PWR0101
+L power:GND #PWR097
 U 1 1 5CA89918
 P 1700 4750
-F 0 "#PWR0101" H 1700 4500 50  0001 C CNN
+F 0 "#PWR097" H 1700 4500 50  0001 C CNN
 F 1 "GND" H 1700 4600 50  0000 C CNN
 F 2 "" H 1700 4750 50  0001 C CNN
 F 3 "" H 1700 4750 50  0001 C CNN
@@ -219,10 +219,10 @@ F 3 "" H 1700 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0103
+L power:GND #PWR099
 U 1 1 5CA89901
 P 2100 4750
-F 0 "#PWR0103" H 2100 4500 50  0001 C CNN
+F 0 "#PWR099" H 2100 4500 50  0001 C CNN
 F 1 "GND" H 2100 4600 50  0000 C CNN
 F 2 "" H 2100 4750 50  0001 C CNN
 F 3 "" H 2100 4750 50  0001 C CNN
@@ -230,10 +230,10 @@ F 3 "" H 2100 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R68
+L Device:R_Small R70
 U 1 1 5CA99BB4
 P 4850 3050
-F 0 "R68" H 4880 3070 50  0000 L CNN
+F 0 "R70" H 4880 3070 50  0000 L CNN
 F 1 "3.3R" H 4880 3010 50  0000 L CNN
 F 2 "" H 4850 3050 50  0001 C CNN
 F 3 "~" H 4850 3050 50  0001 C CNN
@@ -251,10 +251,10 @@ Wire Wire Line
 Wire Wire Line
 	4850 3300 4750 3300
 $Comp
-L Device:C_Small C95
+L Device:C_Small C92
 U 1 1 5CA9AAC4
 P 5400 2950
-F 0 "C95" H 5410 3020 50  0000 L CNN
+F 0 "C92" H 5410 3020 50  0000 L CNN
 F 1 "1 nF" H 5410 2870 50  0000 L CNN
 F 2 "" H 5400 2950 50  0001 C CNN
 F 3 "~" H 5400 2950 50  0001 C CNN
@@ -262,10 +262,10 @@ F 3 "~" H 5400 2950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C98
+L Device:C_Small C95
 U 1 1 5CA9AB1F
 P 5800 2950
-F 0 "C98" H 5810 3020 50  0000 L CNN
+F 0 "C95" H 5810 3020 50  0000 L CNN
 F 1 "1 nF" H 5810 2870 50  0000 L CNN
 F 2 "" H 5800 2950 50  0001 C CNN
 F 3 "~" H 5800 2950 50  0001 C CNN
@@ -287,10 +287,10 @@ Wire Wire Line
 Connection ~ 5400 2750
 Connection ~ 4850 3300
 $Comp
-L power:GND #PWR0113
+L power:GND #PWR0109
 U 1 1 5CA9BC8E
 P 5400 3100
-F 0 "#PWR0113" H 5400 2850 50  0001 C CNN
+F 0 "#PWR0109" H 5400 2850 50  0001 C CNN
 F 1 "GND" H 5400 2950 50  0000 C CNN
 F 2 "" H 5400 3100 50  0001 C CNN
 F 3 "" H 5400 3100 50  0001 C CNN
@@ -298,10 +298,10 @@ F 3 "" H 5400 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0116
+L power:GND #PWR0112
 U 1 1 5CA9BCB2
 P 5800 3100
-F 0 "#PWR0116" H 5800 2850 50  0001 C CNN
+F 0 "#PWR0112" H 5800 2850 50  0001 C CNN
 F 1 "GND" H 5800 2950 50  0000 C CNN
 F 2 "" H 5800 3100 50  0001 C CNN
 F 3 "" H 5800 3100 50  0001 C CNN
@@ -317,10 +317,10 @@ Text Label 6450 2750 0    50   ~ 0
 Text Label 6450 3150 0    50   ~ 0
 V_VCO
 $Comp
-L Device:R_Small R71
+L Device:R_Small R73
 U 1 1 5CA9E3E5
 P 6450 2950
-F 0 "R71" H 6480 2970 50  0000 L CNN
+F 0 "R73" H 6480 2970 50  0000 L CNN
 F 1 "3.3R" H 6480 2910 50  0000 L CNN
 F 2 "" H 6450 2950 50  0001 C CNN
 F 3 "~" H 6450 2950 50  0001 C CNN
@@ -330,10 +330,10 @@ $EndComp
 Wire Wire Line
 	6450 2750 6450 2850
 $Comp
-L Device:C_Small C103
+L Device:C_Small C100
 U 1 1 5CAA0396
 P 6950 2950
-F 0 "C103" H 6960 3020 50  0000 L CNN
+F 0 "C100" H 6960 3020 50  0000 L CNN
 F 1 "0.01 uF" H 6960 2870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6950 2950 50  0001 C CNN
 F 3 "~" H 6950 2950 50  0001 C CNN
@@ -342,10 +342,10 @@ F 4 "80-C0402C103K4R7411" H 6950 2950 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C104
+L Device:C_Small C101
 U 1 1 5CAA039D
 P 7350 2950
-F 0 "C104" H 7360 3020 50  0000 L CNN
+F 0 "C101" H 7360 3020 50  0000 L CNN
 F 1 "0.01 uF" H 7360 2870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7350 2950 50  0001 C CNN
 F 3 "~" H 7350 2950 50  0001 C CNN
@@ -363,10 +363,10 @@ Wire Wire Line
 	6950 2750 6750 2750
 Connection ~ 6950 2750
 $Comp
-L power:GND #PWR0120
+L power:GND #PWR0116
 U 1 1 5CAA03A9
 P 6950 3100
-F 0 "#PWR0120" H 6950 2850 50  0001 C CNN
+F 0 "#PWR0116" H 6950 2850 50  0001 C CNN
 F 1 "GND" H 6950 2950 50  0000 C CNN
 F 2 "" H 6950 3100 50  0001 C CNN
 F 3 "" H 6950 3100 50  0001 C CNN
@@ -374,10 +374,10 @@ F 3 "" H 6950 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0121
+L power:GND #PWR0117
 U 1 1 5CAA03AF
 P 7350 3100
-F 0 "#PWR0121" H 7350 2850 50  0001 C CNN
+F 0 "#PWR0117" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -423,10 +423,10 @@ F 3 "~" H 5650 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C102
+L Device:C_Small C99
 U 1 1 5CADF010
 P 6600 3700
-F 0 "C102" H 6610 3770 50  0000 L CNN
+F 0 "C99" H 6610 3770 50  0000 L CNN
 F 1 "3.9 pF" H 6610 3620 50  0000 L CNN
 F 2 "" H 6600 3700 50  0001 C CNN
 F 3 "~" H 6600 3700 50  0001 C CNN
@@ -434,10 +434,10 @@ F 3 "~" H 6600 3700 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:C_Small C99
+L Device:C_Small C96
 U 1 1 5CADF0E1
 P 5800 3700
-F 0 "C99" H 5810 3770 50  0000 L CNN
+F 0 "C96" H 5810 3770 50  0000 L CNN
 F 1 "3.9 pF" H 5810 3620 50  0000 L CNN
 F 2 "" H 5800 3700 50  0001 C CNN
 F 3 "~" H 5800 3700 50  0001 C CNN
@@ -531,10 +531,10 @@ Wire Wire Line
 Wire Wire Line
 	6800 4200 6900 4200
 $Comp
-L power:GND #PWR0119
+L power:GND #PWR0115
 U 1 1 5CAFD202
 P 6700 4350
-F 0 "#PWR0119" H 6700 4100 50  0001 C CNN
+F 0 "#PWR0115" H 6700 4100 50  0001 C CNN
 F 1 "GND" H 6700 4200 50  0000 C CNN
 F 2 "" H 6700 4350 50  0001 C CNN
 F 3 "" H 6700 4350 50  0001 C CNN
@@ -544,10 +544,10 @@ $EndComp
 Wire Wire Line
 	6700 4350 6900 4350
 $Comp
-L power:GND #PWR0122
+L power:GND #PWR0118
 U 1 1 5CAFEAD6
 P 7400 4600
-F 0 "#PWR0122" H 7400 4350 50  0001 C CNN
+F 0 "#PWR0118" H 7400 4350 50  0001 C CNN
 F 1 "GND" H 7400 4450 50  0000 C CNN
 F 2 "" H 7400 4600 50  0001 C CNN
 F 3 "" H 7400 4600 50  0001 C CNN
@@ -559,10 +559,10 @@ Wire Wire Line
 Wire Wire Line
 	7400 4500 7200 4500
 $Comp
-L Device:R_Small R65
+L Device:R_Small R67
 U 1 1 5CB0094A
 P 1300 4600
-F 0 "R65" H 1330 4620 50  0000 L CNN
+F 0 "R67" H 1330 4620 50  0000 L CNN
 F 1 "470R" H 1330 4560 50  0000 L CNN
 F 2 "" H 1300 4600 50  0001 C CNN
 F 3 "~" H 1300 4600 50  0001 C CNN
@@ -570,10 +570,10 @@ F 3 "~" H 1300 4600 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R66
+L Device:R_Small R68
 U 1 1 5CB00A07
 P 2450 4600
-F 0 "R66" H 2480 4620 50  0000 L CNN
+F 0 "R68" H 2480 4620 50  0000 L CNN
 F 1 "470R" H 2480 4560 50  0000 L CNN
 F 2 "" H 2450 4600 50  0001 C CNN
 F 3 "~" H 2450 4600 50  0001 C CNN
@@ -595,10 +595,10 @@ Connection ~ 2100 4400
 Wire Wire Line
 	2100 4400 2100 4500
 $Comp
-L power:GND #PWR0104
+L power:GND #PWR0100
 U 1 1 5CB044CF
 P 2450 4750
-F 0 "#PWR0104" H 2450 4500 50  0001 C CNN
+F 0 "#PWR0100" H 2450 4500 50  0001 C CNN
 F 1 "GND" H 2450 4600 50  0000 C CNN
 F 2 "" H 2450 4750 50  0001 C CNN
 F 3 "" H 2450 4750 50  0001 C CNN
@@ -608,10 +608,10 @@ $EndComp
 Wire Wire Line
 	2450 4700 2450 4750
 $Comp
-L power:GND #PWR099
+L power:GND #PWR095
 U 1 1 5CB06595
 P 1300 4750
-F 0 "#PWR099" H 1300 4500 50  0001 C CNN
+F 0 "#PWR095" H 1300 4500 50  0001 C CNN
 F 1 "GND" H 1300 4600 50  0000 C CNN
 F 2 "" H 1300 4750 50  0001 C CNN
 F 3 "" H 1300 4750 50  0001 C CNN
@@ -625,10 +625,10 @@ IL=-0.7dB
 Text HLabel 11050 3600 2    50   Input ~ 0
 LO
 $Comp
-L power:GND #PWR0127
+L power:GND #PWR0123
 U 1 1 5CB0CCE1
 P 9450 5000
-F 0 "#PWR0127" H 9450 4750 50  0001 C CNN
+F 0 "#PWR0123" H 9450 4750 50  0001 C CNN
 F 1 "GND" H 9450 4850 50  0000 C CNN
 F 2 "" H 9450 5000 50  0001 C CNN
 F 3 "" H 9450 5000 50  0001 C CNN
@@ -659,10 +659,10 @@ Wire Wire Line
 Wire Wire Line
 	7300 4200 7200 4200
 $Comp
-L power:GND #PWR0123
+L power:GND #PWR0119
 U 1 1 5CB13F61
 P 7600 3900
-F 0 "#PWR0123" H 7600 3650 50  0001 C CNN
+F 0 "#PWR0119" H 7600 3650 50  0001 C CNN
 F 1 "GND" H 7600 3750 50  0000 C CNN
 F 2 "" H 7600 3900 50  0001 C CNN
 F 3 "" H 7600 3900 50  0001 C CNN
@@ -684,10 +684,10 @@ F 4 " 571-2337019-1" H 10800 3900 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0129
+L power:GND #PWR0127
 U 1 1 5CB16963
 P 10800 4150
-F 0 "#PWR0129" H 10800 3900 50  0001 C CNN
+F 0 "#PWR0127" H 10800 3900 50  0001 C CNN
 F 1 "GND" H 10800 4000 50  0000 C CNN
 F 2 "" H 10800 4150 50  0001 C CNN
 F 3 "" H 10800 4150 50  0001 C CNN
@@ -701,10 +701,10 @@ Text Notes 6000 4700 0    50   ~ 0
 Wire Wire Line
 	11050 3600 10500 3600
 $Comp
-L Device:R_Small R72
+L Device:R_Small R74
 U 1 1 5CB210CB
 P 7650 4200
-F 0 "R72" H 7680 4220 50  0000 L CNN
+F 0 "R74" H 7680 4220 50  0000 L CNN
 F 1 "0R" H 7680 4160 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7650 4200 50  0001 C CNN
 F 3 "~" H 7650 4200 50  0001 C CNN
@@ -713,10 +713,10 @@ F 4 "71-CRCW04020000Z0EDC" H 7650 4200 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:R_Small R74
+L Device:R_Small R76
 U 1 1 5CB23A7E
 P 8150 4200
-F 0 "R74" H 8180 4220 50  0000 L CNN
+F 0 "R76" H 8180 4220 50  0000 L CNN
 F 1 "0R" H 8180 4160 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8150 4200 50  0001 C CNN
 F 3 "~" H 8150 4200 50  0001 C CNN
@@ -725,10 +725,10 @@ F 4 "71-CRCW04020000Z0EDC" H 8150 4200 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:R_Small R73
+L Device:R_Small R75
 U 1 1 5CB23AD2
 P 7900 4450
-F 0 "R73" H 7930 4470 50  0000 L CNN
+F 0 "R75" H 7930 4470 50  0000 L CNN
 F 1 "DNP 0402" H 7930 4410 50  0000 L CNN
 F 2 "" H 7900 4450 50  0001 C CNN
 F 3 "~" H 7900 4450 50  0001 C CNN
@@ -736,10 +736,10 @@ F 3 "~" H 7900 4450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0124
+L power:GND #PWR0120
 U 1 1 5CB23C2B
 P 7900 4650
-F 0 "#PWR0124" H 7900 4400 50  0001 C CNN
+F 0 "#PWR0120" H 7900 4400 50  0001 C CNN
 F 1 "GND" H 7900 4500 50  0000 C CNN
 F 2 "" H 7900 4650 50  0001 C CNN
 F 3 "" H 7900 4650 50  0001 C CNN
@@ -770,10 +770,10 @@ F 3 "~" H 8350 4450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C105
+L Device:C_Small C102
 U 1 1 5CB344FD
 P 8500 4200
-F 0 "C105" H 8510 4270 50  0000 L CNN
+F 0 "C102" H 8510 4270 50  0000 L CNN
 F 1 "TBD 0402" H 8510 4120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8500 4200 50  0001 C CNN
 F 3 "~" H 8500 4200 50  0001 C CNN
@@ -782,10 +782,10 @@ F 4 "791-RF15N1R1B500CT" H 8500 4200 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R75
+L Device:R_Small R77
 U 1 1 5CB34623
 P 8200 3250
-F 0 "R75" H 8230 3270 50  0000 L CNN
+F 0 "R77" H 8230 3270 50  0000 L CNN
 F 1 "TBD 0402" H 8230 3210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 8200 3250 50  0001 C CNN
 F 3 "~" H 8200 3250 50  0001 C CNN
@@ -801,10 +801,10 @@ Connection ~ 8350 4200
 Wire Wire Line
 	8350 4200 8400 4200
 $Comp
-L power:GND #PWR0126
+L power:GND #PWR0122
 U 1 1 5CB3CE0A
 P 8350 4650
-F 0 "#PWR0126" H 8350 4400 50  0001 C CNN
+F 0 "#PWR0122" H 8350 4400 50  0001 C CNN
 F 1 "GND" H 8350 4500 50  0000 C CNN
 F 2 "" H 8350 4650 50  0001 C CNN
 F 3 "" H 8350 4650 50  0001 C CNN
@@ -814,10 +814,10 @@ $EndComp
 Wire Wire Line
 	8350 4550 8350 4650
 $Comp
-L Device:C_Small C106
+L Device:C_Small C104
 U 1 1 5CB45D4E
 P 9600 3900
-F 0 "C106" H 9610 3970 50  0000 L CNN
+F 0 "C104" H 9610 3970 50  0000 L CNN
 F 1 "100 pF" H 9610 3820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9600 3900 50  0001 C CNN
 F 3 "~" H 9600 3900 50  0001 C CNN
@@ -846,10 +846,10 @@ Wire Wire Line
 	9450 3650 9450 3900
 Connection ~ 9450 3900
 $Comp
-L Device:R_Small R78
+L Device:R_Small R80
 U 1 1 5CB594A1
 P 9450 3050
-F 0 "R78" H 9480 3070 50  0000 L CNN
+F 0 "R80" H 9480 3070 50  0000 L CNN
 F 1 "10R" H 9480 3010 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -857,10 +857,10 @@ F 3 "~" H 9450 3050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C107
+L Device:C_Small C105
 U 1 1 5CB5CE26
 P 10150 3000
-F 0 "C107" H 10160 3070 50  0000 L CNN
+F 0 "C105" H 10160 3070 50  0000 L CNN
 F 1 "100 pF" H 10160 2920 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10150 3000 50  0001 C CNN
 F 3 "~" H 10150 3000 50  0001 C CNN
@@ -869,10 +869,10 @@ F 4 "791-RF15N101J250CT " H 10150 3000 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C108
+L Device:C_Small C107
 U 1 1 5CB5CE2D
 P 10550 3000
-F 0 "C108" H 10560 3070 50  0000 L CNN
+F 0 "C107" H 10560 3070 50  0000 L CNN
 F 1 "1 nF" H 10560 2920 50  0000 L CNN
 F 2 "" H 10550 3000 50  0001 C CNN
 F 3 "~" H 10550 3000 50  0001 C CNN
@@ -889,10 +889,10 @@ Wire Wire Line
 	10150 2800 9950 2800
 Connection ~ 10150 2800
 $Comp
-L power:GND #PWR0128
+L power:GND #PWR0124
 U 1 1 5CB5CE39
 P 10150 3150
-F 0 "#PWR0128" H 10150 2900 50  0001 C CNN
+F 0 "#PWR0124" H 10150 2900 50  0001 C CNN
 F 1 "GND" H 10150 3000 50  0000 C CNN
 F 2 "" H 10150 3150 50  0001 C CNN
 F 3 "" H 10150 3150 50  0001 C CNN
@@ -900,10 +900,10 @@ F 3 "" H 10150 3150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0130
+L power:GND #PWR0126
 U 1 1 5CB5CE3F
 P 10550 3150
-F 0 "#PWR0130" H 10550 2900 50  0001 C CNN
+F 0 "#PWR0126" H 10550 2900 50  0001 C CNN
 F 1 "GND" H 10550 3000 50  0000 C CNN
 F 2 "" H 10550 3150 50  0001 C CNN
 F 3 "" H 10550 3150 50  0001 C CNN
@@ -924,10 +924,10 @@ Wire Wire Line
 	9450 3150 9450 3200
 Connection ~ 9450 3250
 $Comp
-L Device:R_Small R76
+L Device:R_Small R78
 U 1 1 5CB71150
 P 8650 3250
-F 0 "R76" H 8680 3270 50  0000 L CNN
+F 0 "R78" H 8680 3270 50  0000 L CNN
 F 1 "TBD 0402" H 8680 3210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 8650 3250 50  0001 C CNN
 F 3 "~" H 8650 3250 50  0001 C CNN
@@ -936,10 +936,10 @@ F 4 "NoPart" H 8650 3250 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0125
+L power:GND #PWR0121
 U 1 1 5CB71382
 P 8200 3500
-F 0 "#PWR0125" H 8200 3250 50  0001 C CNN
+F 0 "#PWR0121" H 8200 3250 50  0001 C CNN
 F 1 "GND" H 8200 3350 50  0000 C CNN
 F 2 "" H 8200 3500 50  0001 C CNN
 F 3 "" H 8200 3500 50  0001 C CNN
@@ -982,10 +982,10 @@ Text HLabel 9450 2650 1    50   Input ~ 0
 Wire Wire Line
 	9450 2650 9450 2950
 $Comp
-L Device:R_Small R77
+L Device:R_Small R79
 U 1 1 5CB3952B
 P 8850 4200
-F 0 "R77" H 8880 4220 50  0000 L CNN
+F 0 "R79" H 8880 4220 50  0000 L CNN
 F 1 "10R" H 8880 4160 50  0000 L CNN
 F 2 "" H 8850 4200 50  0001 C CNN
 F 3 "~" H 8850 4200 50  0001 C CNN
@@ -1009,10 +1009,10 @@ TODO figure out attenuator values to get -20 dB and -13 dB
 Text Notes 10500 3550 0    50   ~ 0
 Target is ~~+6dBm
 $Comp
-L Device:C_Small C89
+L Device:C_Small C86
 U 1 1 5CB63054
 P 2500 2800
-F 0 "C89" H 2510 2870 50  0000 L CNN
+F 0 "C86" H 2510 2870 50  0000 L CNN
 F 1 "0.1 uF" H 2510 2720 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2500 2800 50  0001 C CNN
 F 3 "~" H 2500 2800 50  0001 C CNN
@@ -1021,10 +1021,10 @@ F 4 "80-C0402C104M4P" H 2500 2800 50  0001 C CNN "Mouser"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C88
+L Device:C_Small C85
 U 1 1 5CB6305A
 P 2100 2800
-F 0 "C88" H 2110 2870 50  0000 L CNN
+F 0 "C85" H 2110 2870 50  0000 L CNN
 F 1 "0.1 uF" H 2110 2720 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2100 2800 50  0001 C CNN
 F 3 "~" H 2100 2800 50  0001 C CNN
@@ -1040,10 +1040,10 @@ Wire Wire Line
 	2500 2600 2500 2700
 Connection ~ 2500 2600
 $Comp
-L power:GND #PWR0105
+L power:GND #PWR0101
 U 1 1 5CB63065
 P 2500 2950
-F 0 "#PWR0105" H 2500 2700 50  0001 C CNN
+F 0 "#PWR0101" H 2500 2700 50  0001 C CNN
 F 1 "GND" H 2500 2800 50  0000 C CNN
 F 2 "" H 2500 2950 50  0001 C CNN
 F 3 "" H 2500 2950 50  0001 C CNN
@@ -1051,10 +1051,10 @@ F 3 "" H 2500 2950 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0102
+L power:GND #PWR098
 U 1 1 5CB6306B
 P 2100 2950
-F 0 "#PWR0102" H 2100 2700 50  0001 C CNN
+F 0 "#PWR098" H 2100 2700 50  0001 C CNN
 F 1 "GND" H 2100 2800 50  0000 C CNN
 F 2 "" H 2100 2950 50  0001 C CNN
 F 3 "" H 2100 2950 50  0001 C CNN
@@ -1073,10 +1073,10 @@ Wire Wire Line
 	2100 2600 2050 2600
 Connection ~ 2100 2600
 $Comp
-L Device:C_Small C94
+L Device:C_Small C91
 U 1 1 5DC21B18
 P 5400 2250
-F 0 "C94" H 5410 2320 50  0000 L CNN
+F 0 "C91" H 5410 2320 50  0000 L CNN
 F 1 "100 pF" H 5410 2170 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5400 2250 50  0001 C CNN
 F 3 "~" H 5400 2250 50  0001 C CNN
@@ -1085,10 +1085,10 @@ F 4 "791-RF15N101J250CT " H 5400 2250 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C97
+L Device:C_Small C94
 U 1 1 5DC21B1E
 P 5800 2250
-F 0 "C97" H 5810 2320 50  0000 L CNN
+F 0 "C94" H 5810 2320 50  0000 L CNN
 F 1 "100 pF" H 5810 2170 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5800 2250 50  0001 C CNN
 F 3 "~" H 5800 2250 50  0001 C CNN
@@ -1106,10 +1106,10 @@ Wire Wire Line
 	5400 2050 5200 2050
 Connection ~ 5400 2050
 $Comp
-L power:GND #PWR0112
+L power:GND #PWR0108
 U 1 1 5DC21B29
 P 5400 2400
-F 0 "#PWR0112" H 5400 2150 50  0001 C CNN
+F 0 "#PWR0108" H 5400 2150 50  0001 C CNN
 F 1 "GND" H 5400 2250 50  0000 C CNN
 F 2 "" H 5400 2400 50  0001 C CNN
 F 3 "" H 5400 2400 50  0001 C CNN
@@ -1117,10 +1117,10 @@ F 3 "" H 5400 2400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0115
+L power:GND #PWR0111
 U 1 1 5DC21B2F
 P 5800 2400
-F 0 "#PWR0115" H 5800 2150 50  0001 C CNN
+F 0 "#PWR0111" H 5800 2150 50  0001 C CNN
 F 1 "GND" H 5800 2250 50  0000 C CNN
 F 2 "" H 5800 2400 50  0001 C CNN
 F 3 "" H 5800 2400 50  0001 C CNN
@@ -1132,10 +1132,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 2350 5400 2400
 $Comp
-L Device:C_Small C100
+L Device:C_Small C97
 U 1 1 5DC2ABA4
 P 6150 2250
-F 0 "C100" H 6160 2320 50  0000 L CNN
+F 0 "C97" H 6160 2320 50  0000 L CNN
 F 1 "100 pF" H 6160 2170 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6150 2250 50  0001 C CNN
 F 3 "~" H 6150 2250 50  0001 C CNN
@@ -1144,10 +1144,10 @@ F 4 "791-RF15N101J250CT " H 6150 2250 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C101
+L Device:C_Small C98
 U 1 1 5DC2ABAA
 P 6550 2250
-F 0 "C101" H 6560 2320 50  0000 L CNN
+F 0 "C98" H 6560 2320 50  0000 L CNN
 F 1 "100 pF" H 6560 2170 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6550 2250 50  0001 C CNN
 F 3 "~" H 6550 2250 50  0001 C CNN
@@ -1163,10 +1163,10 @@ Wire Wire Line
 	6150 2050 6150 2150
 Connection ~ 6150 2050
 $Comp
-L power:GND #PWR0117
+L power:GND #PWR0113
 U 1 1 5DC2ABB5
 P 6150 2400
-F 0 "#PWR0117" H 6150 2150 50  0001 C CNN
+F 0 "#PWR0113" H 6150 2150 50  0001 C CNN
 F 1 "GND" H 6150 2250 50  0000 C CNN
 F 2 "" H 6150 2400 50  0001 C CNN
 F 3 "" H 6150 2400 50  0001 C CNN
@@ -1174,10 +1174,10 @@ F 3 "" H 6150 2400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0118
+L power:GND #PWR0114
 U 1 1 5DC2ABBB
 P 6550 2400
-F 0 "#PWR0118" H 6550 2150 50  0001 C CNN
+F 0 "#PWR0114" H 6550 2150 50  0001 C CNN
 F 1 "GND" H 6550 2250 50  0000 C CNN
 F 2 "" H 6550 2400 50  0001 C CNN
 F 3 "" H 6550 2400 50  0001 C CNN
@@ -1195,10 +1195,10 @@ Wire Wire Line
 	5200 2050 5200 2750
 Connection ~ 5200 2750
 $Comp
-L power:GND #PWR0108
+L power:GND #PWR0104
 U 1 1 5D904674
 P 3450 5450
-F 0 "#PWR0108" H 3450 5200 50  0001 C CNN
+F 0 "#PWR0104" H 3450 5200 50  0001 C CNN
 F 1 "GND" H 3450 5300 50  0000 C CNN
 F 2 "" H 3450 5450 50  0001 C CNN
 F 3 "" H 3450 5450 50  0001 C CNN
@@ -1210,10 +1210,10 @@ PLL_GND
 Wire Wire Line
 	3350 5450 3450 5450
 $Comp
-L Device:C_Small C92
+L Device:C_Small C89
 U 1 1 5D83B75E
 P 4850 4650
-F 0 "C92" H 4860 4720 50  0000 L CNN
+F 0 "C89" H 4860 4720 50  0000 L CNN
 F 1 "26.1 pF" H 4860 4570 50  0000 L CNN
 F 2 "" H 4850 4650 50  0001 C CNN
 F 3 "~" H 4850 4650 50  0001 C CNN
@@ -1221,10 +1221,10 @@ F 3 "~" H 4850 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R69
+L Device:R_Small R71
 U 1 1 5D83C783
 P 5200 4650
-F 0 "R69" H 5230 4670 50  0000 L CNN
+F 0 "R71" H 5230 4670 50  0000 L CNN
 F 1 "12kR" H 5230 4610 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5200 4650 50  0001 C CNN
 F 3 "~" H 5200 4650 50  0001 C CNN
@@ -1233,10 +1233,10 @@ F 4 "603-RC0603FR-0712KL" H 5200 4650 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C93
+L Device:C_Small C90
 U 1 1 5D83CD64
 P 5200 4950
-F 0 "C93" H 5210 5020 50  0000 L CNN
+F 0 "C90" H 5210 5020 50  0000 L CNN
 F 1 "355 pF" H 5210 4870 50  0000 L CNN
 F 2 "" H 5200 4950 50  0001 C CNN
 F 3 "~" H 5200 4950 50  0001 C CNN
@@ -1244,10 +1244,10 @@ F 3 "~" H 5200 4950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R70
+L Device:R_Small R72
 U 1 1 5D83D464
 P 5400 4400
-F 0 "R70" H 5430 4420 50  0000 L CNN
+F 0 "R72" H 5430 4420 50  0000 L CNN
 F 1 "25.6kR" H 5430 4360 50  0000 L CNN
 F 2 "" H 5400 4400 50  0001 C CNN
 F 3 "~" H 5400 4400 50  0001 C CNN
@@ -1255,10 +1255,10 @@ F 3 "~" H 5400 4400 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:C_Small C96
+L Device:C_Small C93
 U 1 1 5D83E1BA
 P 5650 4650
-F 0 "C96" H 5660 4720 50  0000 L CNN
+F 0 "C93" H 5660 4720 50  0000 L CNN
 F 1 "12 pF" H 5660 4570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5650 4650 50  0001 C CNN
 F 3 "~" H 5650 4650 50  0001 C CNN
@@ -1292,10 +1292,10 @@ Wire Wire Line
 Wire Wire Line
 	5200 4850 5200 4750
 $Comp
-L power:GND #PWR0110
+L power:GND #PWR0106
 U 1 1 5D86CA30
 P 4850 4850
-F 0 "#PWR0110" H 4850 4600 50  0001 C CNN
+F 0 "#PWR0106" H 4850 4600 50  0001 C CNN
 F 1 "GND" H 4850 4700 50  0000 C CNN
 F 2 "" H 4850 4850 50  0001 C CNN
 F 3 "" H 4850 4850 50  0001 C CNN
@@ -1303,10 +1303,10 @@ F 3 "" H 4850 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0111
+L power:GND #PWR0107
 U 1 1 5D86D260
 P 5200 5150
-F 0 "#PWR0111" H 5200 4900 50  0001 C CNN
+F 0 "#PWR0107" H 5200 4900 50  0001 C CNN
 F 1 "GND" H 5200 5000 50  0000 C CNN
 F 2 "" H 5200 5150 50  0001 C CNN
 F 3 "" H 5200 5150 50  0001 C CNN
@@ -1314,10 +1314,10 @@ F 3 "" H 5200 5150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0114
+L power:GND #PWR0110
 U 1 1 5D87220F
 P 5650 4850
-F 0 "#PWR0114" H 5650 4600 50  0001 C CNN
+F 0 "#PWR0110" H 5650 4600 50  0001 C CNN
 F 1 "GND" H 5650 4700 50  0000 C CNN
 F 2 "" H 5650 4850 50  0001 C CNN
 F 3 "" H 5650 4850 50  0001 C CNN
@@ -1345,10 +1345,10 @@ $EndComp
 Wire Wire Line
 	1950 3450 3150 3450
 $Comp
-L power:GND #PWR0100
+L power:GND #PWR096
 U 1 1 5D8A2A91
 P 1550 3850
-F 0 "#PWR0100" H 1550 3600 50  0001 C CNN
+F 0 "#PWR096" H 1550 3600 50  0001 C CNN
 F 1 "GND" H 1550 3700 50  0000 C CNN
 F 2 "" H 1550 3850 50  0001 C CNN
 F 3 "" H 1550 3850 50  0001 C CNN
@@ -1359,10 +1359,10 @@ Text Notes 2200 3400 0    50   ~ 0
 10 MHz
 NoConn ~ 1150 3450
 $Comp
-L Device:C_Small C87
+L Device:C_Small C84
 U 1 1 5D8D7C52
 P 1200 3000
-F 0 "C87" H 1210 3070 50  0000 L CNN
+F 0 "C84" H 1210 3070 50  0000 L CNN
 F 1 "0.1 uF" H 1210 2920 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 3000 50  0001 C CNN
 F 3 "~" H 1200 3000 50  0001 C CNN
@@ -1375,10 +1375,10 @@ Wire Wire Line
 Wire Wire Line
 	1550 3750 1550 3850
 $Comp
-L power:GND #PWR098
+L power:GND #PWR094
 U 1 1 5D8ED055
 P 1000 3000
-F 0 "#PWR098" H 1000 2750 50  0001 C CNN
+F 0 "#PWR094" H 1000 2750 50  0001 C CNN
 F 1 "GND" H 1000 2850 50  0000 C CNN
 F 2 "" H 1000 3000 50  0001 C CNN
 F 3 "" H 1000 3000 50  0001 C CNN
@@ -1392,10 +1392,10 @@ Wire Wire Line
 Text Label 1550 3000 0    50   ~ 0
 3V3
 $Comp
-L discrete-parts:Q_NPN_CBEE Q11
+L discrete-parts:Q_NPN_CBEE Q14
 U 1 1 5DA36F16
 P 9400 4200
-F 0 "Q11" H 9700 4200 50  0000 C CNN
+F 0 "Q14" H 9700 4200 50  0000 C CNN
 F 1 "BFU520R" H 9600 4100 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 9400 4200 50  0001 C CNN
 F 3 "" H 9400 4200 50  0001 C CNN
@@ -1408,10 +1408,10 @@ Wire Wire Line
 Wire Wire Line
 	9550 4500 9550 4400
 $Comp
-L Device:R_Small R161
+L Device:R_Small R81
 U 1 1 5DAD826A
 P 9450 4700
-F 0 "R161" H 9480 4720 50  0000 L CNN
+F 0 "R81" H 9480 4720 50  0000 L CNN
 F 1 "10R" H 9480 4660 50  0000 L CNN
 F 2 "" H 9450 4700 50  0001 C CNN
 F 3 "~" H 9450 4700 50  0001 C CNN
@@ -1431,10 +1431,10 @@ Wire Wire Line
 	9550 4500 9550 4600
 Connection ~ 9550 4500
 $Comp
-L Device:C_Small C211
+L Device:C_Small C103
 U 1 1 5DAD73DC
 P 9550 4700
-F 0 "C211" H 9560 4770 50  0000 L CNN
+F 0 "C103" H 9560 4770 50  0000 L CNN
 F 1 "100 pF" H 9560 4620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9550 4700 50  0001 C CNN
 F 3 "~" H 9550 4700 50  0001 C CNN
@@ -1443,10 +1443,10 @@ F 4 "791-RF15N101J250CT " H 9550 4700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R167
+L Device:R_Small R82
 U 1 1 5D94440F
 P 9950 3900
-F 0 "R167" H 9980 3920 50  0000 L CNN
+F 0 "R82" H 9980 3920 50  0000 L CNN
 F 1 "0R" H 9980 3860 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9950 3900 50  0001 C CNN
 F 3 "~" H 9950 3900 50  0001 C CNN
@@ -1455,10 +1455,10 @@ F 4 "71-CRCW04020000Z0EDC" H 9950 3900 50  0001 C CNN "Mouser"
 	0    -1   1    0   
 $EndComp
 $Comp
-L Device:L_Small L42
+L Device:L_Small L21
 U 1 1 5D944416
 P 10150 4150
-F 0 "L42" H 10180 4190 50  0000 L CNN
+F 0 "L21" H 10180 4190 50  0000 L CNN
 F 1 "TBD 0402" H 10180 4110 50  0000 L CNN
 F 2 "" H 10150 4150 50  0001 C CNN
 F 3 "~" H 10150 4150 50  0001 C CNN
@@ -1466,10 +1466,10 @@ F 3 "~" H 10150 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C216
+L Device:C_Small C106
 U 1 1 5D94441C
 P 10300 3900
-F 0 "C216" H 10310 3970 50  0000 L CNN
+F 0 "C106" H 10310 3970 50  0000 L CNN
 F 1 "TBD 0402" H 10310 3820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10300 3900 50  0001 C CNN
 F 3 "~" H 10300 3900 50  0001 C CNN
@@ -1485,10 +1485,10 @@ Connection ~ 10150 3900
 Wire Wire Line
 	10150 3900 10200 3900
 $Comp
-L power:GND #PWR0260
+L power:GND #PWR0125
 U 1 1 5D944426
 P 10150 4350
-F 0 "#PWR0260" H 10150 4100 50  0001 C CNN
+F 0 "#PWR0125" H 10150 4100 50  0001 C CNN
 F 1 "GND" H 10150 4200 50  0000 C CNN
 F 2 "" H 10150 4350 50  0001 C CNN
 F 3 "" H 10150 4350 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lo.sch-bak b/pcb/discrete/discrete-rf-board/lo.sch-bak
index af8ce10..73e8f9c 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lo.sch-bak
@@ -98,8 +98,9 @@ U 1 1 5CA89672
 P 2800 4600
 F 0 "C90" H 2810 4670 50  0000 L CNN
 F 1 "0.01 uF" H 2810 4520 50  0000 L CNN
-F 2 "" H 2800 4600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2800 4600 50  0001 C CNN
 F 3 "~" H 2800 4600 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 2800 4600 50  0001 C CNN "Mouser"
 	1    2800 4600
 	-1   0    0    -1  
 $EndComp
@@ -334,8 +335,9 @@ U 1 1 5CAA0396
 P 6950 2950
 F 0 "C103" H 6960 3020 50  0000 L CNN
 F 1 "0.01 uF" H 6960 2870 50  0000 L CNN
-F 2 "" H 6950 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6950 2950 50  0001 C CNN
 F 3 "~" H 6950 2950 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 6950 2950 50  0001 C CNN "Mouser"
 	1    6950 2950
 	1    0    0    -1  
 $EndComp
@@ -345,8 +347,9 @@ U 1 1 5CAA039D
 P 7350 2950
 F 0 "C104" H 7360 3020 50  0000 L CNN
 F 1 "0.01 uF" H 7360 2870 50  0000 L CNN
-F 2 "" H 7350 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 7350 2950 50  0001 C CNN
 F 3 "~" H 7350 2950 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 7350 2950 50  0001 C CNN "Mouser"
 	1    7350 2950
 	1    0    0    -1  
 $EndComp
@@ -772,8 +775,9 @@ U 1 1 5CB344FD
 P 8500 4200
 F 0 "C105" H 8510 4270 50  0000 L CNN
 F 1 "TBD 0402" H 8510 4120 50  0000 L CNN
-F 2 "" H 8500 4200 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 8500 4200 50  0001 C CNN
 F 3 "~" H 8500 4200 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 8500 4200 50  0001 C CNN "Mouser"
 	1    8500 4200
 	0    -1   -1   0   
 $EndComp
@@ -783,8 +787,9 @@ U 1 1 5CB34623
 P 8200 3250
 F 0 "R75" H 8230 3270 50  0000 L CNN
 F 1 "TBD 0402" H 8230 3210 50  0000 L CNN
-F 2 "" H 8200 3250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 8200 3250 50  0001 C CNN
 F 3 "~" H 8200 3250 50  0001 C CNN
+F 4 "NoPart" H 8200 3250 50  0001 C CNN "Mouser"
 	1    8200 3250
 	-1   0    0    -1  
 $EndComp
@@ -924,8 +929,9 @@ U 1 1 5CB71150
 P 8650 3250
 F 0 "R76" H 8680 3270 50  0000 L CNN
 F 1 "TBD 0402" H 8680 3210 50  0000 L CNN
-F 2 "" H 8650 3250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 8650 3250 50  0001 C CNN
 F 3 "~" H 8650 3250 50  0001 C CNN
+F 4 "NoPart" H 8650 3250 50  0001 C CNN "Mouser"
 	1    8650 3250
 	-1   0    0    -1  
 $EndComp
@@ -1008,8 +1014,9 @@ U 1 1 5CB63054
 P 2500 2800
 F 0 "C89" H 2510 2870 50  0000 L CNN
 F 1 "0.1 uF" H 2510 2720 50  0000 L CNN
-F 2 "" H 2500 2800 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2500 2800 50  0001 C CNN
 F 3 "~" H 2500 2800 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 2500 2800 50  0001 C CNN "Mouser"
 	1    2500 2800
 	-1   0    0    -1  
 $EndComp
@@ -1019,8 +1026,9 @@ U 1 1 5CB6305A
 P 2100 2800
 F 0 "C88" H 2110 2870 50  0000 L CNN
 F 1 "0.1 uF" H 2110 2720 50  0000 L CNN
-F 2 "" H 2100 2800 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2100 2800 50  0001 C CNN
 F 3 "~" H 2100 2800 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 2100 2800 50  0001 C CNN "Mouser"
 	1    2100 2800
 	-1   0    0    -1  
 $EndComp
@@ -1356,8 +1364,9 @@ U 1 1 5D8D7C52
 P 1200 3000
 F 0 "C87" H 1210 3070 50  0000 L CNN
 F 1 "0.1 uF" H 1210 2920 50  0000 L CNN
-F 2 "" H 1200 3000 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 3000 50  0001 C CNN
 F 3 "~" H 1200 3000 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 1200 3000 50  0001 C CNN "Mouser"
 	1    1200 3000
 	0    1    1    0   
 $EndComp
@@ -1462,8 +1471,9 @@ U 1 1 5D94441C
 P 10300 3900
 F 0 "C216" H 10310 3970 50  0000 L CNN
 F 1 "TBD 0402" H 10310 3820 50  0000 L CNN
-F 2 "" H 10300 3900 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 10300 3900 50  0001 C CNN
 F 3 "~" H 10300 3900 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 10300 3900 50  0001 C CNN "Mouser"
 	1    10300 3900
 	0    -1   -1   0   
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch b/pcb/discrete/discrete-rf-board/mixer.sch
index 958f88b..19bdeb8 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch
+++ b/pcb/discrete/discrete-rf-board/mixer.sch
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 19
+Sheet 3 19
 Title ""
 Date ""
 Rev ""
@@ -27,12 +27,12 @@ IL: ~~-1.33 dB
 Text Notes 5150 2700 0    50   ~ 0
 LO drive should be\n~~ 0 dBm
 $Comp
-L Device:C_Small C29
+L Device:C_Small C25
 U 1 1 5D0F3E9F
 P 7350 3950
-AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C29"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C53"  Part="1" 
-F 0 "C53" H 7258 3904 50  0000 R CNN
+AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C25"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C49"  Part="1" 
+F 0 "C49" H 7258 3904 50  0000 R CNN
 F 1 "100 pF RF" H 7258 3995 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
@@ -41,12 +41,12 @@ F 4 "791-RF15N101J250CT " H 7350 3950 50  0001 C CNN "Mouser"
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GND #PWR048
+L power:GND #PWR044
 U 1 1 5D0F4BFE
 P 7350 4150
-AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR048"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR074"  Part="1" 
-F 0 "#PWR074" H 7350 3900 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR044"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR070"  Part="1" 
+F 0 "#PWR070" H 7350 3900 50  0001 C CNN
 F 1 "GND" H 7355 3977 50  0000 C CNN
 F 2 "" H 7350 4150 50  0001 C CNN
 F 3 "" H 7350 4150 50  0001 C CNN
@@ -56,12 +56,12 @@ $EndComp
 Wire Wire Line
 	7350 4150 7350 4050
 $Comp
-L Device:C_Small C26
+L Device:C_Small C22
 U 1 1 5D0F5E6D
 P 5500 2950
-AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C26"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C50"  Part="1" 
-F 0 "C50" H 5408 2996 50  0000 R CNN
+AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C22"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C46"  Part="1" 
+F 0 "C46" H 5408 2996 50  0000 R CNN
 F 1 "100 pF RF" H 5408 2905 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5500 2950 50  0001 C CNN
 F 3 "~" H 5500 2950 50  0001 C CNN
@@ -74,12 +74,12 @@ Wire Wire Line
 Wire Wire Line
 	7350 3750 7350 3850
 $Comp
-L Device:C_Small C28
+L Device:C_Small C24
 U 1 1 5D101264
 P 6300 3200
-AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C28"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C52"  Part="1" 
-F 0 "C52" H 6310 3270 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C24"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C48"  Part="1" 
+F 0 "C48" H 6310 3270 50  0000 L CNN
 F 1 "DNP 0402" H 6310 3120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
@@ -101,12 +101,12 @@ F 3 "~" H 6050 2950 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GND #PWR045
+L power:GND #PWR041
 U 1 1 5D101EA1
 P 5750 3450
-AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR045"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR071"  Part="1" 
-F 0 "#PWR071" H 5750 3200 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR041"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR067"  Part="1" 
+F 0 "#PWR067" H 5750 3200 50  0001 C CNN
 F 1 "GND" H 5750 3300 50  0000 C CNN
 F 2 "" H 5750 3450 50  0001 C CNN
 F 3 "" H 5750 3450 50  0001 C CNN
@@ -114,12 +114,12 @@ F 3 "" H 5750 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR046
+L power:GND #PWR042
 U 1 1 5D1020F7
 P 6300 3450
-AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR046"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR072"  Part="1" 
-F 0 "#PWR072" H 6300 3200 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR042"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR068"  Part="1" 
+F 0 "#PWR068" H 6300 3200 50  0001 C CNN
 F 1 "GND" H 6300 3300 50  0000 C CNN
 F 2 "" H 6300 3450 50  0001 C CNN
 F 3 "" H 6300 3450 50  0001 C CNN
@@ -165,9 +165,9 @@ U 1 1 5CC49A0F
 P 9800 4350
 AR Path="/5CA6B0AA/5CB33251/5CC49A0F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CC49A0F" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR055"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR081"  Part="1" 
-F 0 "#PWR081" H 9800 4100 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR051"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR077"  Part="1" 
+F 0 "#PWR077" H 9800 4100 50  0001 C CNN
 F 1 "GND" H 9800 4200 50  0000 C CNN
 F 2 "" H 9800 4350 50  0001 C CNN
 F 3 "" H 9800 4350 50  0001 C CNN
@@ -197,9 +197,9 @@ U 1 1 5CBC9FE3
 P 9050 4950
 AR Path="/5CA6B0AA/5CB33251/5CBC9FE3" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CBC9FE3" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR052"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR078"  Part="1" 
-F 0 "#PWR078" H 9050 4700 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR048"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR074"  Part="1" 
+F 0 "#PWR074" H 9050 4700 50  0001 C CNN
 F 1 "GND" H 9050 4800 50  0000 C CNN
 F 2 "" H 9050 4950 50  0001 C CNN
 F 3 "" H 9050 4950 50  0001 C CNN
@@ -215,12 +215,12 @@ Wire Wire Line
 Wire Wire Line
 	7750 5450 7750 5350
 $Comp
-L power:GND #PWR049
+L power:GND #PWR045
 U 1 1 5D125BFA
 P 7750 5450
-AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR049"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR075"  Part="1" 
-F 0 "#PWR075" H 7750 5200 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR045"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR071"  Part="1" 
+F 0 "#PWR071" H 7750 5200 50  0001 C CNN
 F 1 "GND" H 7750 5300 50  0000 C CNN
 F 2 "" H 7750 5450 50  0001 C CNN
 F 3 "" H 7750 5450 50  0001 C CNN
@@ -228,12 +228,12 @@ F 3 "" H 7750 5450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C30
+L Device:C_Small C26
 U 1 1 5D125420
 P 7750 5250
-AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C30"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C54"  Part="1" 
-F 0 "C54" H 7760 5320 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C26"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C50"  Part="1" 
+F 0 "C50" H 7760 5320 50  0000 L CNN
 F 1 "1 nF" H 7760 5170 50  0000 L CNN
 F 2 "" H 7750 5250 50  0001 C CNN
 F 3 "~" H 7750 5250 50  0001 C CNN
@@ -247,12 +247,12 @@ Wire Wire Line
 Wire Wire Line
 	6450 5150 6450 5050
 $Comp
-L power:GND #PWR047
+L power:GND #PWR043
 U 1 1 5D0D0BEF
 P 6450 5150
-AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR047"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR073"  Part="1" 
-F 0 "#PWR073" H 6450 4900 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR043"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR069"  Part="1" 
+F 0 "#PWR069" H 6450 4900 50  0001 C CNN
 F 1 "GND" H 6455 4977 50  0000 C CNN
 F 2 "" H 6450 5150 50  0001 C CNN
 F 3 "" H 6450 5150 50  0001 C CNN
@@ -317,9 +317,9 @@ U 1 1 5CB6E137
 P 9450 3250
 AR Path="/5CA6B0AA/5CB33251/5CB6E137" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6E137" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR054"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR080"  Part="1" 
-F 0 "#PWR080" H 9450 3000 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR050"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR076"  Part="1" 
+F 0 "#PWR076" H 9450 3000 50  0001 C CNN
 F 1 "GND" H 9450 3100 50  0000 C CNN
 F 2 "" H 9450 3250 50  0001 C CNN
 F 3 "" H 9450 3250 50  0001 C CNN
@@ -332,9 +332,9 @@ U 1 1 5CB6DF60
 P 9100 3250
 AR Path="/5CA6B0AA/5CB33251/5CB6DF60" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DF60" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR053"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR079"  Part="1" 
-F 0 "#PWR079" H 9100 3000 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR049"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR075"  Part="1" 
+F 0 "#PWR075" H 9100 3000 50  0001 C CNN
 F 1 "GND" H 9100 3100 50  0000 C CNN
 F 2 "" H 9100 3250 50  0001 C CNN
 F 3 "" H 9100 3250 50  0001 C CNN
@@ -347,9 +347,9 @@ U 1 1 5CB6DBAF
 P 8700 3250
 AR Path="/5CA6B0AA/5CB33251/5CB6DBAF" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DBAF" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR051"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR077"  Part="1" 
-F 0 "#PWR077" H 8700 3000 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR047"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR073"  Part="1" 
+F 0 "#PWR073" H 8700 3000 50  0001 C CNN
 F 1 "GND" H 8700 3100 50  0000 C CNN
 F 2 "" H 8700 3250 50  0001 C CNN
 F 3 "" H 8700 3250 50  0001 C CNN
@@ -362,9 +362,9 @@ U 1 1 5CB6D892
 P 8350 3250
 AR Path="/5CA6B0AA/5CB33251/5CB6D892" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6D892" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR050"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR076"  Part="1" 
-F 0 "#PWR076" H 8350 3000 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR046"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR072"  Part="1" 
+F 0 "#PWR072" H 8350 3000 50  0001 C CNN
 F 1 "GND" H 8350 3100 50  0000 C CNN
 F 2 "" H 8350 3250 50  0001 C CNN
 F 3 "" H 8350 3250 50  0001 C CNN
@@ -377,9 +377,9 @@ U 1 1 5CB6B125
 P 9450 3050
 AR Path="/5CA6B0AA/5CB33251/5CB6B125" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6B125" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C35"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C59"  Part="1" 
-F 0 "C59" H 9460 3120 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C31"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C55"  Part="1" 
+F 0 "C55" H 9460 3120 50  0000 L CNN
 F 1 "1 nF" H 9460 2970 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -392,9 +392,9 @@ U 1 1 5CB6AE2E
 P 9100 3050
 AR Path="/5CA6B0AA/5CB33251/5CB6AE2E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AE2E" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C34"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C58"  Part="1" 
-F 0 "C58" H 9110 3120 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C30"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C54"  Part="1" 
+F 0 "C54" H 9110 3120 50  0000 L CNN
 F 1 "100 pF" H 9110 2970 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9100 3050 50  0001 C CNN
 F 3 "~" H 9100 3050 50  0001 C CNN
@@ -408,9 +408,9 @@ U 1 1 5CB6AABA
 P 8700 3050
 AR Path="/5CA6B0AA/5CB33251/5CB6AABA" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AABA" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C32"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C56"  Part="1" 
-F 0 "C56" H 8710 3120 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C28"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C52"  Part="1" 
+F 0 "C52" H 8710 3120 50  0000 L CNN
 F 1 "100 pF" H 8710 2970 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8700 3050 50  0001 C CNN
 F 3 "~" H 8700 3050 50  0001 C CNN
@@ -424,9 +424,9 @@ U 1 1 5CB6A8A7
 P 8350 3050
 AR Path="/5CA6B0AA/5CB33251/5CB6A8A7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5CB6A8A7" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C31"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C55"  Part="1" 
-F 0 "C55" H 8360 3120 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C27"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C51"  Part="1" 
+F 0 "C51" H 8360 3120 50  0000 L CNN
 F 1 "100 pF" H 8360 2970 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8350 3050 50  0001 C CNN
 F 3 "~" H 8350 3050 50  0001 C CNN
@@ -512,12 +512,12 @@ Wire Wire Line
 Wire Wire Line
 	7600 4800 8050 4800
 $Comp
-L Device:C_Small C33
+L Device:C_Small C29
 U 1 1 5D169258
 P 9050 4650
-AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C33"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C57"  Part="1" 
-F 0 "C57" H 9060 4720 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C29"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C53"  Part="1" 
+F 0 "C53" H 9060 4720 50  0000 L CNN
 F 1 "2.2 pF RF" H 9060 4570 50  0000 L CNN
 F 2 "" H 9050 4650 50  0001 C CNN
 F 3 "~" H 9050 4650 50  0001 C CNN
@@ -575,12 +575,12 @@ Wire Wire Line
 Wire Wire Line
 	5050 4700 5400 4700
 $Comp
-L Device:C_Small C23
+L Device:C_Small C19
 U 1 1 5D19065F
 P 4600 5050
-AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C23"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C47"  Part="1" 
-F 0 "C47" H 4610 5120 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C19"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C43"  Part="1" 
+F 0 "C43" H 4610 5120 50  0000 L CNN
 F 1 "1 nF" H 4610 4970 50  0000 L CNN
 F 2 "" H 4600 5050 50  0001 C CNN
 F 3 "~" H 4600 5050 50  0001 C CNN
@@ -597,12 +597,12 @@ Connection ~ 4600 4800
 Wire Wire Line
 	4600 4800 4600 4950
 $Comp
-L power:GND #PWR041
+L power:GND #PWR037
 U 1 1 5D193951
 P 4600 5250
-AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR041"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR067"  Part="1" 
-F 0 "#PWR067" H 4600 5000 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR037"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR063"  Part="1" 
+F 0 "#PWR063" H 4600 5000 50  0001 C CNN
 F 1 "GND" H 4600 5100 50  0000 C CNN
 F 2 "" H 4600 5250 50  0001 C CNN
 F 3 "" H 4600 5250 50  0001 C CNN
@@ -621,12 +621,12 @@ Text HLabel 3200 5850 0    50   Input ~ 0
 -1V2
 Connection ~ 5400 5850
 $Comp
-L power:GND #PWR033
+L power:GND #PWR029
 U 1 1 5D1B2EB0
 P 3000 5000
-AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR033"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR059"  Part="1" 
-F 0 "#PWR059" H 3000 4750 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR029"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR055"  Part="1" 
+F 0 "#PWR055" H 3000 4750 50  0001 C CNN
 F 1 "GND" H 3000 4850 50  0000 C CNN
 F 2 "" H 3000 5000 50  0001 C CNN
 F 3 "" H 3000 5000 50  0001 C CNN
@@ -715,12 +715,12 @@ Text Label 3700 3850 0    50   ~ 0
 Wire Wire Line
 	3700 3850 3700 4000
 $Comp
-L Device:C_Small C17
+L Device:C_Small C13
 U 1 1 5D1EB863
 P 3500 6400
-AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C17"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C41"  Part="1" 
-F 0 "C41" H 3510 6470 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C13"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C37"  Part="1" 
+F 0 "C37" H 3510 6470 50  0000 L CNN
 F 1 "100 pF" H 3510 6320 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3500 6400 50  0001 C CNN
 F 3 "~" H 3500 6400 50  0001 C CNN
@@ -729,12 +729,12 @@ F 4 "791-RF15N101J250CT " H 3500 6400 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C19
+L Device:C_Small C15
 U 1 1 5D1EBDD5
 P 3850 6400
-AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C19"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C43"  Part="1" 
-F 0 "C43" H 3860 6470 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C15"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C39"  Part="1" 
+F 0 "C39" H 3860 6470 50  0000 L CNN
 F 1 "1 nF" H 3860 6320 50  0000 L CNN
 F 2 "" H 3850 6400 50  0001 C CNN
 F 3 "~" H 3850 6400 50  0001 C CNN
@@ -742,12 +742,12 @@ F 3 "~" H 3850 6400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C21
+L Device:C_Small C17
 U 1 1 5D1EC2AA
 P 4250 6400
-AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C21"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C45"  Part="1" 
-F 0 "C45" H 4260 6470 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C17"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C41"  Part="1" 
+F 0 "C41" H 4260 6470 50  0000 L CNN
 F 1 "0.1 uF" H 4260 6320 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
@@ -756,12 +756,12 @@ F 4 "80-C0402C104M4P" H 4250 6400 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR039
+L power:GND #PWR035
 U 1 1 5D1F5C64
 P 4250 6600
-AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR039"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR065"  Part="1" 
-F 0 "#PWR065" H 4250 6350 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR035"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR061"  Part="1" 
+F 0 "#PWR061" H 4250 6350 50  0001 C CNN
 F 1 "GND" H 4250 6450 50  0000 C CNN
 F 2 "" H 4250 6600 50  0001 C CNN
 F 3 "" H 4250 6600 50  0001 C CNN
@@ -769,12 +769,12 @@ F 3 "" H 4250 6600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR037
+L power:GND #PWR033
 U 1 1 5D1F5F88
 P 3850 6600
-AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR037"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR063"  Part="1" 
-F 0 "#PWR063" H 3850 6350 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR033"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR059"  Part="1" 
+F 0 "#PWR059" H 3850 6350 50  0001 C CNN
 F 1 "GND" H 3850 6450 50  0000 C CNN
 F 2 "" H 3850 6600 50  0001 C CNN
 F 3 "" H 3850 6600 50  0001 C CNN
@@ -782,12 +782,12 @@ F 3 "" H 3850 6600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR035
+L power:GND #PWR031
 U 1 1 5D1F629A
 P 3500 6600
-AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR035"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR061"  Part="1" 
-F 0 "#PWR061" H 3500 6350 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR031"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR057"  Part="1" 
+F 0 "#PWR057" H 3500 6350 50  0001 C CNN
 F 1 "GND" H 3500 6450 50  0000 C CNN
 F 2 "" H 3500 6600 50  0001 C CNN
 F 3 "" H 3500 6600 50  0001 C CNN
@@ -821,8 +821,8 @@ L Device:Q_NPN_BCE Q3
 U 1 1 5D11C60F
 P 2050 3450
 AR Path="/5CA6B0B3/5CC199E0/5D11C60F" Ref="Q3"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q12"  Part="1" 
-F 0 "Q12" H 2241 3496 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q8"  Part="1" 
+F 0 "Q8" H 2241 3496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2241 3405 50  0000 L CNN
 F 2 "" H 2250 3550 50  0001 C CNN
 F 3 "~" H 2050 3450 50  0001 C CNN
@@ -921,12 +921,12 @@ F 3 "~" H 1250 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR032
+L power:GND #PWR028
 U 1 1 5D1A89A5
 P 2150 4100
-AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR032"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR058"  Part="1" 
-F 0 "#PWR058" H 2150 3850 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR028"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR054"  Part="1" 
+F 0 "#PWR054" H 2150 3850 50  0001 C CNN
 F 1 "GND" H 2155 3927 50  0000 C CNN
 F 2 "" H 2150 4100 50  0001 C CNN
 F 3 "" H 2150 4100 50  0001 C CNN
@@ -934,12 +934,12 @@ F 3 "" H 2150 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR030
+L power:GND #PWR026
 U 1 1 5D1A9311
 P 1250 3900
-AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR030"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR056"  Part="1" 
-F 0 "#PWR056" H 1250 3650 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR026"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR052"  Part="1" 
+F 0 "#PWR052" H 1250 3650 50  0001 C CNN
 F 1 "GND" H 1255 3727 50  0000 C CNN
 F 2 "" H 1250 3900 50  0001 C CNN
 F 3 "" H 1250 3900 50  0001 C CNN
@@ -947,12 +947,12 @@ F 3 "" H 1250 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR031
+L power:GND #PWR027
 U 1 1 5D1ABF37
 P 1750 3900
-AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR031"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR057"  Part="1" 
-F 0 "#PWR057" H 1750 3650 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR027"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR053"  Part="1" 
+F 0 "#PWR053" H 1750 3650 50  0001 C CNN
 F 1 "GND" H 1755 3727 50  0000 C CNN
 F 2 "" H 1750 3900 50  0001 C CNN
 F 3 "" H 1750 3900 50  0001 C CNN
@@ -960,12 +960,12 @@ F 3 "" H 1750 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C14
+L Device:C_Small C10
 U 1 1 5D1AC551
 P 1750 3700
-AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C14"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C38"  Part="1" 
-F 0 "C38" H 1760 3770 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C10"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C34"  Part="1" 
+F 0 "C34" H 1760 3770 50  0000 L CNN
 F 1 "0.1 uF" H 1760 3620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1750 3700 50  0001 C CNN
 F 3 "~" H 1750 3700 50  0001 C CNN
@@ -974,12 +974,12 @@ F 4 "80-C0402C104M4P" H 1750 3700 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C13
+L Device:C_Small C9
 U 1 1 5D1AD1B8
 P 1200 2550
-AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C13"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C37"  Part="1" 
-F 0 "C37" V 971 2550 50  0000 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C9"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C33"  Part="1" 
+F 0 "C33" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
@@ -988,12 +988,12 @@ F 4 "80-C0402C104M4P" H 1200 2550 50  0001 C CNN "Mouser"
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C_Small C15
+L Device:C_Small C11
 U 1 1 5D1ADA21
 P 3200 2650
-AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C15"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C39"  Part="1" 
-F 0 "C39" H 3108 2604 50  0000 R CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C11"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C35"  Part="1" 
+F 0 "C35" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
@@ -1002,12 +1002,12 @@ F 4 "80-C0402C104M4P" H 3200 2650 50  0001 C CNN "Mouser"
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GND #PWR034
+L power:GND #PWR030
 U 1 1 5D1AE084
 P 3200 2850
-AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR034"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR060"  Part="1" 
-F 0 "#PWR060" H 3200 2600 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR030"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR056"  Part="1" 
+F 0 "#PWR056" H 3200 2600 50  0001 C CNN
 F 1 "GND" H 3205 2677 50  0000 C CNN
 F 2 "" H 3200 2850 50  0001 C CNN
 F 3 "" H 3200 2850 50  0001 C CNN
@@ -1094,12 +1094,12 @@ Wire Wire Line
 Text Notes 2600 950  0    50   ~ 0
 ~~11 mA quiescent current\nNot much gain but it does convert to differential
 $Comp
-L Device:C_Small C12
+L Device:C_Small C8
 U 1 1 5D271283
 P 1200 2000
-AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C12"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C36"  Part="1" 
-F 0 "C36" V 971 2000 50  0000 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C8"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C32"  Part="1" 
+F 0 "C32" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
@@ -1108,12 +1108,12 @@ F 4 "80-C0402C104M4P" H 1200 2000 50  0001 C CNN "Mouser"
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C_Small C16
+L Device:C_Small C12
 U 1 1 5D271572
 P 3450 2000
-AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C16"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C40"  Part="1" 
-F 0 "C40" V 3221 2000 50  0000 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C12"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C36"  Part="1" 
+F 0 "C36" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
@@ -1218,12 +1218,12 @@ Connection ~ 2300 1900
 Text Notes 4600 6050 0    50   ~ 0
 Sets bias point so that the common mode voltage is close to ground
 $Comp
-L Device:C_Small C27
+L Device:C_Small C23
 U 1 1 5D100E2B
 P 5750 3200
-AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C27"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C51"  Part="1" 
-F 0 "C51" H 5760 3270 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C23"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C47"  Part="1" 
+F 0 "C47" H 5760 3270 50  0000 L CNN
 F 1 "DNP 0402" H 5760 3120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5750 3200 50  0001 C CNN
 F 3 "~" H 5750 3200 50  0001 C CNN
@@ -1255,12 +1255,12 @@ Wire Wire Line
 	5400 3200 5400 2950
 Connection ~ 5400 2950
 $Comp
-L power:GND #PWR043
+L power:GND #PWR039
 U 1 1 5D85A260
 P 4850 3500
-AR Path="/5CA6B0B3/5CC199E0/5D85A260" Ref="#PWR043"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D85A260" Ref="#PWR069"  Part="1" 
-F 0 "#PWR069" H 4850 3250 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5D85A260" Ref="#PWR039"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5D85A260" Ref="#PWR065"  Part="1" 
+F 0 "#PWR065" H 4850 3250 50  0001 C CNN
 F 1 "GND" H 4850 3350 50  0000 C CNN
 F 2 "" H 4850 3500 50  0001 C CNN
 F 3 "" H 4850 3500 50  0001 C CNN
@@ -1281,9 +1281,9 @@ U 1 1 5DADE110
 P 3800 1650
 AR Path="/5CA6B0AA/5CB33251/5DADE110" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DADE110" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DADE110" Ref="#PWR036"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DADE110" Ref="#PWR062"  Part="1" 
-F 0 "#PWR062" H 3800 1400 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5DADE110" Ref="#PWR032"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DADE110" Ref="#PWR058"  Part="1" 
+F 0 "#PWR058" H 3800 1400 50  0001 C CNN
 F 1 "GND" H 3800 1500 50  0000 C CNN
 F 2 "" H 3800 1650 50  0001 C CNN
 F 3 "" H 3800 1650 50  0001 C CNN
@@ -1296,9 +1296,9 @@ U 1 1 5DADE116
 P 3800 1450
 AR Path="/5CA6B0AA/5CB33251/5DADE116" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DADE116" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DADE116" Ref="C18"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DADE116" Ref="C42"  Part="1" 
-F 0 "C42" H 3810 1520 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5DADE116" Ref="C14"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DADE116" Ref="C38"  Part="1" 
+F 0 "C38" H 3810 1520 50  0000 L CNN
 F 1 "1 nF" H 3810 1370 50  0000 L CNN
 F 2 "" H 3800 1450 50  0001 C CNN
 F 3 "~" H 3800 1450 50  0001 C CNN
@@ -1313,9 +1313,9 @@ U 1 1 5DAE8BF5
 P 4150 1650
 AR Path="/5CA6B0AA/5CB33251/5DAE8BF5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BF5" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DAE8BF5" Ref="#PWR038"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DAE8BF5" Ref="#PWR064"  Part="1" 
-F 0 "#PWR064" H 4150 1400 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5DAE8BF5" Ref="#PWR034"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DAE8BF5" Ref="#PWR060"  Part="1" 
+F 0 "#PWR060" H 4150 1400 50  0001 C CNN
 F 1 "GND" H 4150 1500 50  0000 C CNN
 F 2 "" H 4150 1650 50  0001 C CNN
 F 3 "" H 4150 1650 50  0001 C CNN
@@ -1328,9 +1328,9 @@ U 1 1 5DAE8BFB
 P 4150 1450
 AR Path="/5CA6B0AA/5CB33251/5DAE8BFB" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BFB" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DAE8BFB" Ref="C20"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DAE8BFB" Ref="C44"  Part="1" 
-F 0 "C44" H 4160 1520 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5DAE8BFB" Ref="C16"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DAE8BFB" Ref="C40"  Part="1" 
+F 0 "C40" H 4160 1520 50  0000 L CNN
 F 1 "0.1 uf" H 4160 1370 50  0000 L CNN
 F 2 "" H 4150 1450 50  0001 C CNN
 F 3 "~" H 4150 1450 50  0001 C CNN
@@ -1351,9 +1351,9 @@ U 1 1 5DB0FBEB
 P 4750 4300
 AR Path="/5CA6B0AA/5CB33251/5DB0FBEB" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBEB" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB0FBEB" Ref="#PWR042"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB0FBEB" Ref="#PWR068"  Part="1" 
-F 0 "#PWR068" H 4750 4050 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB0FBEB" Ref="#PWR038"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB0FBEB" Ref="#PWR064"  Part="1" 
+F 0 "#PWR064" H 4750 4050 50  0001 C CNN
 F 1 "GND" H 4750 4150 50  0000 C CNN
 F 2 "" H 4750 4300 50  0001 C CNN
 F 3 "" H 4750 4300 50  0001 C CNN
@@ -1366,9 +1366,9 @@ U 1 1 5DB0FBF1
 P 4750 4100
 AR Path="/5CA6B0AA/5CB33251/5DB0FBF1" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBF1" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB0FBF1" Ref="C24"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB0FBF1" Ref="C48"  Part="1" 
-F 0 "C48" H 4760 4170 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB0FBF1" Ref="C20"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB0FBF1" Ref="C44"  Part="1" 
+F 0 "C44" H 4760 4170 50  0000 L CNN
 F 1 "0.1 uF" H 4760 4020 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4750 4100 50  0001 C CNN
 F 3 "~" H 4750 4100 50  0001 C CNN
@@ -1388,9 +1388,9 @@ U 1 1 5DB0FBFA
 P 5100 4300
 AR Path="/5CA6B0AA/5CB33251/5DB0FBFA" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBFA" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB0FBFA" Ref="#PWR044"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB0FBFA" Ref="#PWR070"  Part="1" 
-F 0 "#PWR070" H 5100 4050 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB0FBFA" Ref="#PWR040"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB0FBFA" Ref="#PWR066"  Part="1" 
+F 0 "#PWR066" H 5100 4050 50  0001 C CNN
 F 1 "GND" H 5100 4150 50  0000 C CNN
 F 2 "" H 5100 4300 50  0001 C CNN
 F 3 "" H 5100 4300 50  0001 C CNN
@@ -1403,9 +1403,9 @@ U 1 1 5DB0FC00
 P 5100 4100
 AR Path="/5CA6B0AA/5CB33251/5DB0FC00" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FC00" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB0FC00" Ref="C25"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB0FC00" Ref="C49"  Part="1" 
-F 0 "C49" H 5110 4170 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB0FC00" Ref="C21"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB0FC00" Ref="C45"  Part="1" 
+F 0 "C45" H 5110 4170 50  0000 L CNN
 F 1 "0.1 uF" H 5110 4020 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5100 4100 50  0001 C CNN
 F 3 "~" H 5100 4100 50  0001 C CNN
@@ -1424,9 +1424,9 @@ U 1 1 5DB1C7E1
 P 4450 1650
 AR Path="/5CA6B0AA/5CB33251/5DB1C7E1" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E1" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB1C7E1" Ref="#PWR040"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB1C7E1" Ref="#PWR066"  Part="1" 
-F 0 "#PWR066" H 4450 1400 50  0001 C CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB1C7E1" Ref="#PWR036"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB1C7E1" Ref="#PWR062"  Part="1" 
+F 0 "#PWR062" H 4450 1400 50  0001 C CNN
 F 1 "GND" H 4450 1500 50  0000 C CNN
 F 2 "" H 4450 1650 50  0001 C CNN
 F 3 "" H 4450 1650 50  0001 C CNN
@@ -1439,9 +1439,9 @@ U 1 1 5DB1C7E7
 P 4450 1450
 AR Path="/5CA6B0AA/5CB33251/5DB1C7E7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E7" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E0/5DB1C7E7" Ref="C22"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5DB1C7E7" Ref="C46"  Part="1" 
-F 0 "C46" H 4460 1520 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E0/5DB1C7E7" Ref="C18"  Part="1" 
+AR Path="/5CA6B0B3/5CC199E2/5DB1C7E7" Ref="C42"  Part="1" 
+F 0 "C42" H 4460 1520 50  0000 L CNN
 F 1 "0.1 uF" H 4460 1370 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 1450 50  0001 C CNN
 F 3 "~" H 4450 1450 50  0001 C CNN
@@ -1495,8 +1495,8 @@ P 5300 5550
 AR Path="/5CA6B0AA/5CC4DFC2/5D987D02" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D987D02" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D987D02" Ref="Q5"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D987D02" Ref="Q9"  Part="1" 
-F 0 "Q9" H 5500 5600 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E2/5D987D02" Ref="Q10"  Part="1" 
+F 0 "Q10" H 5500 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 5500 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5500 5650 50  0001 C CNN
 F 3 "~" H 5300 5550 50  0001 C CNN
@@ -1511,8 +1511,8 @@ P 6000 5550
 AR Path="/5CA6B0AA/5CC4DFC2/5D988714" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5D988714" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E0/5D988714" Ref="Q5"  Part="2" 
-AR Path="/5CA6B0B3/5CC199E2/5D988714" Ref="Q9"  Part="2" 
-F 0 "Q9" H 6200 5600 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E2/5D988714" Ref="Q10"  Part="2" 
+F 0 "Q10" H 6200 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6200 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6200 5650 50  0001 C CNN
 F 3 "~" H 6000 5550 50  0001 C CNN
@@ -1553,8 +1553,8 @@ L Device:Q_DUAL_PNP_PNP_E1B1C2E2B2C1 Q4
 U 1 1 5D9CC5B4
 P 4250 4700
 AR Path="/5CA6B0B3/5CC199E0/5D9CC5B4" Ref="Q4"  Part="1" 
-AR Path="/5CA6B0B3/5CC199E2/5D9CC5B4" Ref="Q8"  Part="1" 
-F 0 "Q8" H 4450 4750 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E2/5D9CC5B4" Ref="Q9"  Part="1" 
+F 0 "Q9" H 4450 4750 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 4450 4650 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4450 4800 50  0001 C CNN
 F 3 "~" H 4250 4700 50  0001 C CNN
@@ -1567,8 +1567,8 @@ L Device:Q_DUAL_PNP_PNP_E1B1C2E2B2C1 Q4
 U 2 1 5D9CE704
 P 3300 4950
 AR Path="/5CA6B0B3/5CC199E0/5D9CE704" Ref="Q4"  Part="2" 
-AR Path="/5CA6B0B3/5CC199E2/5D9CE704" Ref="Q8"  Part="2" 
-F 0 "Q8" H 3500 5000 50  0000 L CNN
+AR Path="/5CA6B0B3/5CC199E2/5D9CE704" Ref="Q9"  Part="2" 
+F 0 "Q9" H 3500 5000 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 3500 4900 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3500 5050 50  0001 C CNN
 F 3 "~" H 3300 4950 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch-bak b/pcb/discrete/discrete-rf-board/mixer.sch-bak
index 9c31fa1..958f88b 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/mixer.sch-bak
@@ -550,8 +550,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D18C9DE" Ref="R19"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D18C9DE" Ref="R33"  Part="1" 
 F 0 "R33" H 4980 4720 50  0000 L CNN
 F 1 "10kR" H 4980 4660 50  0000 L CNN
-F 2 "" H 4950 4700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4950 4700 50  0001 C CNN
 F 3 "~" H 4950 4700 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 4950 4700 50  0001 C CNN "Mouser"
 	1    4950 4700
 	0    -1   -1   0   
 $EndComp
@@ -563,8 +564,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D18CEC8" Ref="R20"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D18CEC8" Ref="R34"  Part="1" 
 F 0 "R34" H 4980 4820 50  0000 L CNN
 F 1 "10kR" H 4980 4760 50  0000 L CNN
-F 2 "" H 4950 4800 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4950 4800 50  0001 C CNN
 F 3 "~" H 4950 4800 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 4950 4800 50  0001 C CNN "Mouser"
 	1    4950 4800
 	0    -1   1    0   
 $EndComp
@@ -646,8 +648,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D1B6E50" Ref="R18"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D1B6E50" Ref="R32"  Part="1" 
 F 0 "R32" H 3730 4120 50  0000 L CNN
 F 1 "10kR" H 3730 4060 50  0000 L CNN
-F 2 "" H 3700 4100 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3700 4100 50  0001 C CNN
 F 3 "~" H 3700 4100 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 3700 4100 50  0001 C CNN "Mouser"
 	1    3700 4100
 	1    0    0    -1  
 $EndComp
@@ -746,8 +749,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C21"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C45"  Part="1" 
 F 0 "C45" H 4260 6470 50  0000 L CNN
 F 1 "0.1 uF" H 4260 6320 50  0000 L CNN
-F 2 "" H 4250 6400 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4250 6400 50  0001 C CNN "Mouser"
 	1    4250 6400
 	1    0    0    -1  
 $EndComp
@@ -977,8 +981,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C13"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C37"  Part="1" 
 F 0 "C37" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
-F 2 "" H 1200 2550 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 1200 2550 50  0001 C CNN "Mouser"
 	1    1200 2550
 	0    1    1    0   
 $EndComp
@@ -990,8 +995,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C15"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C39"  Part="1" 
 F 0 "C39" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
-F 2 "" H 3200 2650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 3200 2650 50  0001 C CNN "Mouser"
 	1    3200 2650
 	-1   0    0    1   
 $EndComp
@@ -1095,8 +1101,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C12"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C36"  Part="1" 
 F 0 "C36" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
-F 2 "" H 1200 2000 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 1200 2000 50  0001 C CNN "Mouser"
 	1    1200 2000
 	0    1    1    0   
 $EndComp
@@ -1108,8 +1115,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C16"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C40"  Part="1" 
 F 0 "C40" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
-F 2 "" H 3450 2000 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 3450 2000 50  0001 C CNN "Mouser"
 	1    3450 2000
 	0    1    1    0   
 $EndComp
@@ -1362,8 +1370,9 @@ AR Path="/5CA6B0B3/5CC199E0/5DB0FBF1" Ref="C24"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBF1" Ref="C48"  Part="1" 
 F 0 "C48" H 4760 4170 50  0000 L CNN
 F 1 "0.1 uF" H 4760 4020 50  0000 L CNN
-F 2 "" H 4750 4100 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4750 4100 50  0001 C CNN
 F 3 "~" H 4750 4100 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4750 4100 50  0001 C CNN "Mouser"
 	1    4750 4100
 	1    0    0    -1  
 $EndComp
@@ -1398,8 +1407,9 @@ AR Path="/5CA6B0B3/5CC199E0/5DB0FC00" Ref="C25"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5DB0FC00" Ref="C49"  Part="1" 
 F 0 "C49" H 5110 4170 50  0000 L CNN
 F 1 "0.1 uF" H 5110 4020 50  0000 L CNN
-F 2 "" H 5100 4100 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5100 4100 50  0001 C CNN
 F 3 "~" H 5100 4100 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 5100 4100 50  0001 C CNN "Mouser"
 	1    5100 4100
 	1    0    0    -1  
 $EndComp
@@ -1433,8 +1443,9 @@ AR Path="/5CA6B0B3/5CC199E0/5DB1C7E7" Ref="C22"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5DB1C7E7" Ref="C46"  Part="1" 
 F 0 "C46" H 4460 1520 50  0000 L CNN
 F 1 "0.1 uF" H 4460 1370 50  0000 L CNN
-F 2 "" H 4450 1450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 1450 50  0001 C CNN
 F 3 "~" H 4450 1450 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 4450 1450 50  0001 C CNN "Mouser"
 	1    4450 1450
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/pa.sch b/pcb/discrete/discrete-rf-board/pa.sch
index 15de19a..ea4330f 100644
--- a/pcb/discrete/discrete-rf-board/pa.sch
+++ b/pcb/discrete/discrete-rf-board/pa.sch
@@ -24,8 +24,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8B1" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8B1" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8B1" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8B1" Ref="R?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8B1" Ref="R43"  Part="1" 
-F 0 "R43" H 6141 3954 50  0000 R CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8B1" Ref="R45"  Part="1" 
+F 0 "R45" H 6141 3954 50  0000 R CNN
 F 1 "75R" H 6141 4045 50  0000 R CNN
 F 2 "" H 6200 4000 50  0001 C CNN
 F 3 "~" H 6200 4000 50  0001 C CNN
@@ -42,8 +42,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8B8" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8B8" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8B8" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8B8" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8B8" Ref="C70"  Part="1" 
-F 0 "C70" V 7629 3800 50  0000 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8B8" Ref="C66"  Part="1" 
+F 0 "C66" V 7629 3800 50  0000 C CNN
 F 1 "100 pF RF" V 7538 3800 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7400 3800 50  0001 C CNN
 F 3 "~" H 7400 3800 50  0001 C CNN
@@ -65,8 +65,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8C1" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8C1" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8C1" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8C1" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8C1" Ref="#PWR087"  Part="1" 
-F 0 "#PWR087" H 4250 4350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8C1" Ref="#PWR081"  Part="1" 
+F 0 "#PWR081" H 4250 4350 50  0001 C CNN
 F 1 "GND" H 4255 4427 50  0000 C CNN
 F 2 "" H 4250 4600 50  0001 C CNN
 F 3 "" H 4250 4600 50  0001 C CNN
@@ -85,8 +85,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8C8" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8C8" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8C8" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8C8" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8C8" Ref="#PWR097"  Part="1" 
-F 0 "#PWR097" H 6650 4100 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8C8" Ref="#PWR090"  Part="1" 
+F 0 "#PWR090" H 6650 4100 50  0001 C CNN
 F 1 "GND" H 6655 4177 50  0000 C CNN
 F 2 "" H 6650 4350 50  0001 C CNN
 F 3 "" H 6650 4350 50  0001 C CNN
@@ -108,8 +108,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8D8" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8D8" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8D8" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8D8" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8D8" Ref="C69"  Part="1" 
-F 0 "C69" H 6742 4246 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8D8" Ref="C63"  Part="1" 
+F 0 "C63" H 6742 4246 50  0000 L CNN
 F 1 "TBD 0402" H 6742 4155 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6650 4200 50  0001 C CNN
 F 3 "~" H 6650 4200 50  0001 C CNN
@@ -147,8 +147,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8E5" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8E5" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8E5" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8E5" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8E5" Ref="C60"  Part="1" 
-F 0 "C60" V 3829 4250 50  0000 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8E5" Ref="C56"  Part="1" 
+F 0 "C56" V 3829 4250 50  0000 C CNN
 F 1 "100 pF RF" V 3738 4250 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3600 4250 50  0001 C CNN
 F 3 "~" H 3600 4250 50  0001 C CNN
@@ -184,8 +184,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8F1" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8F1" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8F1" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8F1" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8F1" Ref="C63"  Part="1" 
-F 0 "C63" H 4342 4496 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8F1" Ref="C57"  Part="1" 
+F 0 "C57" H 4342 4496 50  0000 L CNN
 F 1 "TBD 0402" H 4342 4405 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4250 4450 50  0001 C CNN
 F 3 "~" H 4250 4450 50  0001 C CNN
@@ -203,8 +203,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8F7" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8F7" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8F7" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8F7" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8F7" Ref="#PWR094"  Part="1" 
-F 0 "#PWR094" H 5650 5250 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8F7" Ref="#PWR086"  Part="1" 
+F 0 "#PWR086" H 5650 5250 50  0001 C CNN
 F 1 "GND" H 5655 5327 50  0000 C CNN
 F 2 "" H 5650 5500 50  0001 C CNN
 F 3 "" H 5650 5500 50  0001 C CNN
@@ -221,8 +221,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A8FD" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A8FD" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A8FD" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8FD" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A8FD" Ref="C62"  Part="1" 
-F 0 "C62" H 7310 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A8FD" Ref="C65"  Part="1" 
+F 0 "C65" H 7310 2470 50  0000 L CNN
 F 1 "1 nF" H 7310 2320 50  0000 L CNN
 F 2 "" H 7300 2400 50  0001 C CNN
 F 3 "~" H 7300 2400 50  0001 C CNN
@@ -239,8 +239,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A903" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A903" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A903" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A903" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A903" Ref="C65"  Part="1" 
-F 0 "C65" H 6910 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A903" Ref="C64"  Part="1" 
+F 0 "C64" H 6910 2470 50  0000 L CNN
 F 1 "100 pF RF" H 6910 2320 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6900 2400 50  0001 C CNN
 F 3 "~" H 6900 2400 50  0001 C CNN
@@ -258,8 +258,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A909" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A909" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A909" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A909" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A909" Ref="C67"  Part="1" 
-F 0 "C67" H 6510 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A909" Ref="C62"  Part="1" 
+F 0 "C62" H 6510 2470 50  0000 L CNN
 F 1 "100 pF RF" H 6510 2320 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6500 2400 50  0001 C CNN
 F 3 "~" H 6500 2400 50  0001 C CNN
@@ -277,8 +277,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A90F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A90F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A90F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A90F" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A90F" Ref="#PWR086"  Part="1" 
-F 0 "#PWR086" H 7300 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A90F" Ref="#PWR092"  Part="1" 
+F 0 "#PWR092" H 7300 2350 50  0001 C CNN
 F 1 "GND" H 7300 2450 50  0000 C CNN
 F 2 "" H 7300 2600 50  0001 C CNN
 F 3 "" H 7300 2600 50  0001 C CNN
@@ -295,8 +295,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A915" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A915" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A915" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A915" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A915" Ref="#PWR089"  Part="1" 
-F 0 "#PWR089" H 6900 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A915" Ref="#PWR091"  Part="1" 
+F 0 "#PWR091" H 6900 2350 50  0001 C CNN
 F 1 "GND" H 6900 2450 50  0000 C CNN
 F 2 "" H 6900 2600 50  0001 C CNN
 F 3 "" H 6900 2600 50  0001 C CNN
@@ -313,8 +313,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A91B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A91B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A91B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A91B" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A91B" Ref="#PWR093"  Part="1" 
-F 0 "#PWR093" H 6500 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A91B" Ref="#PWR089"  Part="1" 
+F 0 "#PWR089" H 6500 2350 50  0001 C CNN
 F 1 "GND" H 6500 2450 50  0000 C CNN
 F 2 "" H 6500 2600 50  0001 C CNN
 F 3 "" H 6500 2600 50  0001 C CNN
@@ -331,8 +331,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A921" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A921" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A921" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A921" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A921" Ref="C66"  Part="1" 
-F 0 "C66" H 5260 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A921" Ref="C59"  Part="1" 
+F 0 "C59" H 5260 2470 50  0000 L CNN
 F 1 "100 pF RF" H 5260 2320 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5250 2400 50  0001 C CNN
 F 3 "~" H 5250 2400 50  0001 C CNN
@@ -350,8 +350,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A927" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A927" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A927" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A927" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A927" Ref="#PWR092"  Part="1" 
-F 0 "#PWR092" H 5250 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A927" Ref="#PWR085"  Part="1" 
+F 0 "#PWR085" H 5250 2350 50  0001 C CNN
 F 1 "GND" H 5250 2450 50  0000 C CNN
 F 2 "" H 5250 2600 50  0001 C CNN
 F 3 "" H 5250 2600 50  0001 C CNN
@@ -368,8 +368,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A92D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A92D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A92D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A92D" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A92D" Ref="C64"  Part="1" 
-F 0 "C64" H 4860 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A92D" Ref="C58"  Part="1" 
+F 0 "C58" H 4860 2470 50  0000 L CNN
 F 1 "1 nF" H 4860 2320 50  0000 L CNN
 F 2 "" H 4850 2400 50  0001 C CNN
 F 3 "~" H 4850 2400 50  0001 C CNN
@@ -386,8 +386,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A933" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A933" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A933" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A933" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A933" Ref="#PWR088"  Part="1" 
-F 0 "#PWR088" H 4850 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A933" Ref="#PWR083"  Part="1" 
+F 0 "#PWR083" H 4850 2350 50  0001 C CNN
 F 1 "GND" H 4850 2450 50  0000 C CNN
 F 2 "" H 4850 2600 50  0001 C CNN
 F 3 "" H 4850 2600 50  0001 C CNN
@@ -440,8 +440,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A950" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A950" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A950" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A950" Ref="R?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A950" Ref="R42"  Part="1" 
-F 0 "R42" H 5680 2670 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A950" Ref="R43"  Part="1" 
+F 0 "R43" H 5680 2670 50  0000 L CNN
 F 1 "22R" H 5680 2610 50  0000 L CNN
 F 2 "" H 5650 2650 50  0001 C CNN
 F 3 "~" H 5650 2650 50  0001 C CNN
@@ -463,8 +463,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A95B" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A95B" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A95B" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A95B" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A95B" Ref="C61"  Part="1" 
-F 0 "C61" H 7710 2470 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A95B" Ref="C67"  Part="1" 
+F 0 "C67" H 7710 2470 50  0000 L CNN
 F 1 "1 nF" H 7710 2320 50  0000 L CNN
 F 2 "" H 7700 2400 50  0001 C CNN
 F 3 "~" H 7700 2400 50  0001 C CNN
@@ -481,8 +481,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A961" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A961" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A961" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A961" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A961" Ref="#PWR085"  Part="1" 
-F 0 "#PWR085" H 7700 2350 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A961" Ref="#PWR093"  Part="1" 
+F 0 "#PWR093" H 7700 2350 50  0001 C CNN
 F 1 "GND" H 7700 2450 50  0000 C CNN
 F 2 "" H 7700 2600 50  0001 C CNN
 F 3 "" H 7700 2600 50  0001 C CNN
@@ -530,8 +530,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A996" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A996" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A996" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A996" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A996" Ref="C68"  Part="1" 
-F 0 "C68" H 6292 4596 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A996" Ref="C61"  Part="1" 
+F 0 "C61" H 6292 4596 50  0000 L CNN
 F 1 "100 pF RF" H 6292 4505 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6200 4550 50  0001 C CNN
 F 3 "~" H 6200 4550 50  0001 C CNN
@@ -555,8 +555,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D91A99F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D91A99F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D91A99F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A99F" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A99F" Ref="#PWR096"  Part="1" 
-F 0 "#PWR096" H 6200 4500 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A99F" Ref="#PWR088"  Part="1" 
+F 0 "#PWR088" H 6200 4500 50  0001 C CNN
 F 1 "GND" H 6205 4577 50  0000 C CNN
 F 2 "" H 6200 4750 50  0001 C CNN
 F 3 "" H 6200 4750 50  0001 C CNN
@@ -619,8 +619,8 @@ L power:GND #PWR?
 U 1 1 5D91A9C3
 P 5100 4850
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D91A9C3" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A9C3" Ref="#PWR091"  Part="1" 
-F 0 "#PWR091" H 5100 4600 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A9C3" Ref="#PWR084"  Part="1" 
+F 0 "#PWR084" H 5100 4600 50  0001 C CNN
 F 1 "GND" H 5100 4700 50  0000 C CNN
 F 2 "" H 5100 4850 50  0001 C CNN
 F 3 "" H 5100 4850 50  0001 C CNN
@@ -641,8 +641,8 @@ L power:GND #PWR?
 U 1 1 5D91A9CE
 P 6000 3500
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D91A9CE" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D91A9CE" Ref="#PWR095"  Part="1" 
-F 0 "#PWR095" H 6000 3250 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D91A9CE" Ref="#PWR087"  Part="1" 
+F 0 "#PWR087" H 6000 3250 50  0001 C CNN
 F 1 "GND" H 6000 3350 50  0000 C CNN
 F 2 "" H 6000 3500 50  0001 C CNN
 F 3 "" H 6000 3500 50  0001 C CNN
@@ -718,8 +718,8 @@ L power:GND #PWR?
 U 1 1 5D92B480
 P 2450 4000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D92B480" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D92B480" Ref="#PWR082"  Part="1" 
-F 0 "#PWR082" H 2450 3750 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D92B480" Ref="#PWR078"  Part="1" 
+F 0 "#PWR078" H 2450 3750 50  0001 C CNN
 F 1 "GND" H 2450 3850 50  0000 C CNN
 F 2 "" H 2450 4000 50  0001 C CNN
 F 3 "" H 2450 4000 50  0001 C CNN
@@ -740,8 +740,8 @@ L power:GND #PWR?
 U 1 1 5D92F5D9
 P 3000 4700
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D92F5D9" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D92F5D9" Ref="#PWR083"  Part="1" 
-F 0 "#PWR083" H 3000 4450 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D92F5D9" Ref="#PWR079"  Part="1" 
+F 0 "#PWR079" H 3000 4450 50  0001 C CNN
 F 1 "GND" H 3000 4550 50  0000 C CNN
 F 2 "" H 3000 4700 50  0001 C CNN
 F 3 "" H 3000 4700 50  0001 C CNN
@@ -755,8 +755,8 @@ L power:GND #PWR?
 U 1 1 5D9325CE
 P 3450 4700
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9325CE" Ref="#PWR?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D9325CE" Ref="#PWR084"  Part="1" 
-F 0 "#PWR084" H 3450 4450 50  0001 C CNN
+AR Path="/5CA6B0B3/5D830BD7/5D9325CE" Ref="#PWR080"  Part="1" 
+F 0 "#PWR080" H 3450 4450 50  0001 C CNN
 F 1 "GND" H 3450 4550 50  0000 C CNN
 F 2 "" H 3450 4700 50  0001 C CNN
 F 3 "" H 3450 4700 50  0001 C CNN
@@ -783,10 +783,10 @@ Connection ~ 4250 4250
 Wire Wire Line
 	3900 4250 3700 4250
 $Comp
-L Device:R_Small R44
+L Device:R_Small R46
 U 1 1 5D94B276
 P 6950 3800
-F 0 "R44" H 6980 3820 50  0000 L CNN
+F 0 "R46" H 6980 3820 50  0000 L CNN
 F 1 "0R" H 6980 3760 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6950 3800 50  0001 C CNN
 F 3 "~" H 6950 3800 50  0001 C CNN
@@ -800,10 +800,10 @@ Wire Wire Line
 	6850 3800 6650 3800
 Connection ~ 6650 3800
 $Comp
-L discrete-parts:Q_NPN_CBEE Q10
+L discrete-parts:Q_NPN_CBEE Q11
 U 1 1 5DA49B97
 P 5600 4250
-F 0 "Q10" H 5900 4250 50  0000 C CNN
+F 0 "Q11" H 5900 4250 50  0000 C CNN
 F 1 "BFU520R" H 5800 4150 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 5600 4250 50  0001 C CNN
 F 3 "" H 5600 4250 50  0001 C CNN
@@ -812,10 +812,10 @@ F 4 " 771-BFU520R " H 5600 4250 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R165
+L Device:R_Small R42
 U 1 1 5D8BA739
 P 4750 4250
-F 0 "R165" H 4780 4270 50  0000 L CNN
+F 0 "R42" H 4780 4270 50  0000 L CNN
 F 1 "TBD 0402" H 4780 4210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 4750 4250 50  0001 C CNN
 F 3 "~" H 4750 4250 50  0001 C CNN
@@ -861,10 +861,10 @@ F 4 "NoPart" H 4550 3600 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR090
+L power:GND #PWR082
 U 1 1 5D8D9920
 P 4550 3800
-F 0 "#PWR090" H 4550 3550 50  0001 C CNN
+F 0 "#PWR082" H 4550 3550 50  0001 C CNN
 F 1 "GND" H 4550 3650 50  0000 C CNN
 F 2 "" H 4550 3800 50  0001 C CNN
 F 3 "" H 4550 3800 50  0001 C CNN
@@ -898,8 +898,8 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D8F7969" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D8F7969" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8F7969" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8F7969" Ref="C?"  Part="1" 
-AR Path="/5CA6B0B3/5D830BD7/5D8F7969" Ref="C215"  Part="1" 
-F 0 "C215" H 5842 4796 50  0000 L CNN
+AR Path="/5CA6B0B3/5D830BD7/5D8F7969" Ref="C60"  Part="1" 
+F 0 "C60" H 5842 4796 50  0000 L CNN
 F 1 "100 pF RF" H 5842 4705 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 5750 4750 50  0001 C CNN
 F 3 "~" H 5750 4750 50  0001 C CNN
@@ -908,10 +908,10 @@ F 4 "791-RF15N101J250CT " H 5750 4750 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R166
+L Device:R_Small R44
 U 1 1 5D8F7DC7
 P 5650 4950
-F 0 "R166" H 5680 4970 50  0000 L CNN
+F 0 "R44" H 5680 4970 50  0000 L CNN
 F 1 "TBD 0402" H 5680 4910 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5650 4950 50  0001 C CNN
 F 3 "~" H 5650 4950 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/pa.sch-bak b/pcb/discrete/discrete-rf-board/pa.sch-bak
index 6574130..15de19a 100644
--- a/pcb/discrete/discrete-rf-board/pa.sch-bak
+++ b/pcb/discrete/discrete-rf-board/pa.sch-bak
@@ -111,8 +111,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8D8" Ref="C?"  Part="1"
 AR Path="/5CA6B0B3/5D830BD7/5D91A8D8" Ref="C69"  Part="1" 
 F 0 "C69" H 6742 4246 50  0000 L CNN
 F 1 "TBD 0402" H 6742 4155 50  0000 L CNN
-F 2 "" H 6650 4200 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6650 4200 50  0001 C CNN
 F 3 "~" H 6650 4200 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 6650 4200 50  0001 C CNN "Mouser"
 	1    6650 4200
 	1    0    0    -1  
 $EndComp
@@ -186,8 +187,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8F1" Ref="C?"  Part="1"
 AR Path="/5CA6B0B3/5D830BD7/5D91A8F1" Ref="C63"  Part="1" 
 F 0 "C63" H 4342 4496 50  0000 L CNN
 F 1 "TBD 0402" H 4342 4405 50  0000 L CNN
-F 2 "" H 4250 4450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4250 4450 50  0001 C CNN
 F 3 "~" H 4250 4450 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 4250 4450 50  0001 C CNN "Mouser"
 	1    4250 4450
 	-1   0    0    -1  
 $EndComp
@@ -815,8 +817,9 @@ U 1 1 5D8BA739
 P 4750 4250
 F 0 "R165" H 4780 4270 50  0000 L CNN
 F 1 "TBD 0402" H 4780 4210 50  0000 L CNN
-F 2 "" H 4750 4250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4750 4250 50  0001 C CNN
 F 3 "~" H 4750 4250 50  0001 C CNN
+F 4 "NoPart" H 4750 4250 50  0001 C CNN "Mouser"
 	1    4750 4250
 	0    1    1    0   
 $EndComp
@@ -839,8 +842,9 @@ U 1 1 5D8D8348
 P 4550 3200
 F 0 "R40" H 4580 3220 50  0000 L CNN
 F 1 "TBD 0402" H 4580 3160 50  0000 L CNN
-F 2 "" H 4550 3200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4550 3200 50  0001 C CNN
 F 3 "~" H 4550 3200 50  0001 C CNN
+F 4 "NoPart" H 4550 3200 50  0001 C CNN "Mouser"
 	1    4550 3200
 	1    0    0    -1  
 $EndComp
@@ -850,8 +854,9 @@ U 1 1 5D8D8FCC
 P 4550 3600
 F 0 "R41" H 4580 3620 50  0000 L CNN
 F 1 "TBD 0402" H 4580 3560 50  0000 L CNN
-F 2 "" H 4550 3600 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4550 3600 50  0001 C CNN
 F 3 "~" H 4550 3600 50  0001 C CNN
+F 4 "NoPart" H 4550 3600 50  0001 C CNN "Mouser"
 	1    4550 3600
 	1    0    0    -1  
 $EndComp
@@ -908,8 +913,9 @@ U 1 1 5D8F7DC7
 P 5650 4950
 F 0 "R166" H 5680 4970 50  0000 L CNN
 F 1 "TBD 0402" H 5680 4910 50  0000 L CNN
-F 2 "" H 5650 4950 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5650 4950 50  0001 C CNN
 F 3 "~" H 5650 4950 50  0001 C CNN
+F 4 "NoPart" H 5650 4950 50  0001 C CNN "Mouser"
 	1    5650 4950
 	-1   0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/receiver.sch b/pcb/discrete/discrete-rf-board/receiver.sch
index f55650a..186bfa4 100644
--- a/pcb/discrete/discrete-rf-board/receiver.sch
+++ b/pcb/discrete/discrete-rf-board/receiver.sch
@@ -76,10 +76,10 @@ F 4 "719-SF2098H " H 2750 3600 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0133
+L power:GND #PWR0130
 U 1 1 5D1C755D
 P 2950 4150
-F 0 "#PWR0133" H 2950 3900 50  0001 C CNN
+F 0 "#PWR0130" H 2950 3900 50  0001 C CNN
 F 1 "GND" H 2950 4000 50  0000 C CNN
 F 2 "" H 2950 4150 50  0001 C CNN
 F 3 "" H 2950 4150 50  0001 C CNN
@@ -130,10 +130,10 @@ F 4 " 620-PD0810J5050S2HF" H 3850 3600 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0135
+L power:GND #PWR0132
 U 1 1 5D8ADC07
 P 3750 4200
-F 0 "#PWR0135" H 3750 3950 50  0001 C CNN
+F 0 "#PWR0132" H 3750 3950 50  0001 C CNN
 F 1 "GND" H 3750 4050 50  0000 C CNN
 F 2 "" H 3750 4200 50  0001 C CNN
 F 3 "" H 3750 4200 50  0001 C CNN
@@ -179,10 +179,10 @@ Wire Wire Line
 Wire Wire Line
 	4550 4100 4750 4100
 $Comp
-L power:GND #PWR0134
+L power:GND #PWR0131
 U 1 1 5D8B4310
 P 3250 2900
-F 0 "#PWR0134" H 3250 2650 50  0001 C CNN
+F 0 "#PWR0131" H 3250 2650 50  0001 C CNN
 F 1 "GND" H 3250 2750 50  0000 C CNN
 F 2 "" H 3250 2900 50  0001 C CNN
 F 3 "" H 3250 2900 50  0001 C CNN
@@ -192,10 +192,10 @@ $EndComp
 Wire Wire Line
 	3250 2900 3250 2800
 $Comp
-L Device:R_Small R79
+L Device:R_Small R83
 U 1 1 5D8B4C1C
 P 2700 2800
-F 0 "R79" H 2730 2820 50  0000 L CNN
+F 0 "R83" H 2730 2820 50  0000 L CNN
 F 1 "50R" H 2730 2760 50  0000 L CNN
 F 2 "" H 2700 2800 50  0001 C CNN
 F 3 "~" H 2700 2800 50  0001 C CNN
@@ -203,10 +203,10 @@ F 3 "~" H 2700 2800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0132
+L power:GND #PWR0129
 U 1 1 5D8B502A
 P 2700 3000
-F 0 "#PWR0132" H 2700 2750 50  0001 C CNN
+F 0 "#PWR0129" H 2700 2750 50  0001 C CNN
 F 1 "GND" H 2700 2850 50  0000 C CNN
 F 2 "" H 2700 3000 50  0001 C CNN
 F 3 "" H 2700 3000 50  0001 C CNN
@@ -236,10 +236,10 @@ F 4 " 700-MAX1193ETI+T " H 9550 2500 50  0000 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R82
+L Device:R_Small R86
 U 1 1 5D9C48D2
 P 7550 3850
-F 0 "R82" H 7580 3870 50  0000 L CNN
+F 0 "R86" H 7580 3870 50  0000 L CNN
 F 1 "10kR" H 7580 3810 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7550 3850 50  0001 C CNN
 F 3 "~" H 7550 3850 50  0001 C CNN
@@ -248,10 +248,10 @@ F 4 "603-AC0402FR-1310KL" H 7550 3850 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R84
+L Device:R_Small R88
 U 1 1 5D9C9C4F
 P 7950 3850
-F 0 "R84" H 7980 3870 50  0000 L CNN
+F 0 "R88" H 7980 3870 50  0000 L CNN
 F 1 "10kR" H 7980 3810 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7950 3850 50  0001 C CNN
 F 3 "~" H 7950 3850 50  0001 C CNN
@@ -260,10 +260,10 @@ F 4 "603-AC0402FR-1310KL" H 7950 3850 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C110
+L Device:C_Small C109
 U 1 1 5D9CB2FC
 P 7750 4300
-F 0 "C110" H 7760 4370 50  0000 L CNN
+F 0 "C109" H 7760 4370 50  0000 L CNN
 F 1 "470 pF" H 7760 4220 50  0000 L CNN
 F 2 "" H 7750 4300 50  0001 C CNN
 F 3 "~" H 7750 4300 50  0001 C CNN
@@ -313,10 +313,10 @@ Wire Wire Line
 Text Label 7550 3650 0    50   ~ 0
 COM
 $Comp
-L Device:R_Small R81
+L Device:R_Small R85
 U 1 1 5D9D617C
 P 7550 2450
-F 0 "R81" H 7580 2470 50  0000 L CNN
+F 0 "R85" H 7580 2470 50  0000 L CNN
 F 1 "10kR" H 7580 2410 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7550 2450 50  0001 C CNN
 F 3 "~" H 7550 2450 50  0001 C CNN
@@ -325,10 +325,10 @@ F 4 "603-AC0402FR-1310KL" H 7550 2450 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R_Small R83
+L Device:R_Small R87
 U 1 1 5D9D6182
 P 7950 2450
-F 0 "R83" H 7980 2470 50  0000 L CNN
+F 0 "R87" H 7980 2470 50  0000 L CNN
 F 1 "10kR" H 7980 2410 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7950 2450 50  0001 C CNN
 F 3 "~" H 7950 2450 50  0001 C CNN
@@ -337,10 +337,10 @@ F 4 "603-AC0402FR-1310KL" H 7950 2450 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C109
+L Device:C_Small C108
 U 1 1 5D9D6188
 P 7750 2900
-F 0 "C109" H 7760 2970 50  0000 L CNN
+F 0 "C108" H 7760 2970 50  0000 L CNN
 F 1 "470 pF" H 7760 2820 50  0000 L CNN
 F 2 "" H 7750 2900 50  0001 C CNN
 F 3 "~" H 7750 2900 50  0001 C CNN
@@ -392,10 +392,10 @@ Wire Wire Line
 Wire Wire Line
 	8300 3600 8900 3600
 $Comp
-L power:GND #PWR0143
+L power:GND #PWR0140
 U 1 1 5D9DF64D
 P 9650 5600
-F 0 "#PWR0143" H 9650 5350 50  0001 C CNN
+F 0 "#PWR0140" H 9650 5350 50  0001 C CNN
 F 1 "GND" H 9650 5450 50  0000 C CNN
 F 2 "" H 9650 5600 50  0001 C CNN
 F 3 "" H 9650 5600 50  0001 C CNN
@@ -426,10 +426,10 @@ Wire Wire Line
 Text Label 8700 5100 0    50   ~ 0
 COM
 $Comp
-L Device:C_Small C113
+L Device:C_Small C112
 U 1 1 5DA20E43
 P 8600 5100
-F 0 "C113" H 8610 5170 50  0000 L CNN
+F 0 "C112" H 8610 5170 50  0000 L CNN
 F 1 "0.33 uF" H 8610 5020 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8600 5100 50  0001 C CNN
 F 3 "~" H 8600 5100 50  0001 C CNN
@@ -438,10 +438,10 @@ F 4 "710-885012106014" H 8600 5100 50  0001 C CNN "Mouser"
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C_Small C111
+L Device:C_Small C110
 U 1 1 5DA213AC
 P 8200 4800
-F 0 "C111" H 8210 4870 50  0000 L CNN
+F 0 "C110" H 8210 4870 50  0000 L CNN
 F 1 "0.33 uF" H 8210 4720 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8200 4800 50  0001 C CNN
 F 3 "~" H 8200 4800 50  0001 C CNN
@@ -450,10 +450,10 @@ F 4 "710-885012106014" H 8200 4800 50  0001 C CNN "Mouser"
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C_Small C112
+L Device:C_Small C111
 U 1 1 5DA217D8
 P 8450 4900
-F 0 "C112" H 8460 4970 50  0000 L CNN
+F 0 "C111" H 8460 4970 50  0000 L CNN
 F 1 "0.33 uF" H 8460 4820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8450 4900 50  0001 C CNN
 F 3 "~" H 8450 4900 50  0001 C CNN
@@ -466,10 +466,10 @@ Wire Wire Line
 Wire Wire Line
 	8300 4800 8900 4800
 $Comp
-L power:GND #PWR0138
+L power:GND #PWR0135
 U 1 1 5DA2B3FF
 P 8000 4800
-F 0 "#PWR0138" H 8000 4550 50  0001 C CNN
+F 0 "#PWR0135" H 8000 4550 50  0001 C CNN
 F 1 "GND" H 8000 4650 50  0000 C CNN
 F 2 "" H 8000 4800 50  0001 C CNN
 F 3 "" H 8000 4800 50  0001 C CNN
@@ -479,10 +479,10 @@ $EndComp
 Wire Wire Line
 	8000 4800 8100 4800
 $Comp
-L power:GND #PWR0139
+L power:GND #PWR0136
 U 1 1 5DA2D17E
 P 8000 4900
-F 0 "#PWR0139" H 8000 4650 50  0001 C CNN
+F 0 "#PWR0136" H 8000 4650 50  0001 C CNN
 F 1 "GND" H 8000 4750 50  0000 C CNN
 F 2 "" H 8000 4900 50  0001 C CNN
 F 3 "" H 8000 4900 50  0001 C CNN
@@ -492,10 +492,10 @@ $EndComp
 Wire Wire Line
 	8000 4900 8350 4900
 $Comp
-L power:GND #PWR0140
+L power:GND #PWR0137
 U 1 1 5DA3594B
 P 8000 5100
-F 0 "#PWR0140" H 8000 4850 50  0001 C CNN
+F 0 "#PWR0137" H 8000 4850 50  0001 C CNN
 F 1 "GND" H 8000 4950 50  0000 C CNN
 F 2 "" H 8000 5100 50  0001 C CNN
 F 3 "" H 8000 5100 50  0001 C CNN
@@ -547,10 +547,10 @@ ADC_D1
 Text HLabel 10850 5000 2    50   Input ~ 0
 ADC_D0
 $Comp
-L Device:R_Small R85
+L Device:R_Small R89
 U 1 1 5DA9C8FD
 P 10350 4300
-F 0 "R85" H 10380 4320 50  0000 L CNN
+F 0 "R89" H 10380 4320 50  0000 L CNN
 F 1 "0R" H 10380 4260 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10350 4300 50  0001 C CNN
 F 3 "~" H 10350 4300 50  0001 C CNN
@@ -559,10 +559,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10350 4300 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R89
+L Device:R_Small R93
 U 1 1 5DAA04E2
 P 10650 4400
-F 0 "R89" H 10680 4420 50  0000 L CNN
+F 0 "R93" H 10680 4420 50  0000 L CNN
 F 1 "0R" H 10680 4360 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10650 4400 50  0001 C CNN
 F 3 "~" H 10650 4400 50  0001 C CNN
@@ -571,10 +571,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10650 4400 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R86
+L Device:R_Small R90
 U 1 1 5DAA138E
 P 10350 4500
-F 0 "R86" H 10380 4520 50  0000 L CNN
+F 0 "R90" H 10380 4520 50  0000 L CNN
 F 1 "0R" H 10380 4460 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10350 4500 50  0001 C CNN
 F 3 "~" H 10350 4500 50  0001 C CNN
@@ -583,10 +583,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10350 4500 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R90
+L Device:R_Small R94
 U 1 1 5DAA1394
 P 10650 4600
-F 0 "R90" H 10680 4620 50  0000 L CNN
+F 0 "R94" H 10680 4620 50  0000 L CNN
 F 1 "0R" H 10680 4560 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10650 4600 50  0001 C CNN
 F 3 "~" H 10650 4600 50  0001 C CNN
@@ -595,10 +595,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10650 4600 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R87
+L Device:R_Small R91
 U 1 1 5DAA40B3
 P 10350 4700
-F 0 "R87" H 10380 4720 50  0000 L CNN
+F 0 "R91" H 10380 4720 50  0000 L CNN
 F 1 "0R" H 10380 4660 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10350 4700 50  0001 C CNN
 F 3 "~" H 10350 4700 50  0001 C CNN
@@ -607,10 +607,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10350 4700 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R91
+L Device:R_Small R95
 U 1 1 5DAA40B9
 P 10650 4800
-F 0 "R91" H 10680 4820 50  0000 L CNN
+F 0 "R95" H 10680 4820 50  0000 L CNN
 F 1 "0R" H 10680 4760 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10650 4800 50  0001 C CNN
 F 3 "~" H 10650 4800 50  0001 C CNN
@@ -619,10 +619,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10650 4800 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R88
+L Device:R_Small R92
 U 1 1 5DAA40BF
 P 10350 4900
-F 0 "R88" H 10380 4920 50  0000 L CNN
+F 0 "R92" H 10380 4920 50  0000 L CNN
 F 1 "0R" H 10380 4860 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10350 4900 50  0001 C CNN
 F 3 "~" H 10350 4900 50  0001 C CNN
@@ -631,10 +631,10 @@ F 4 "71-CRCW04020000Z0EDC" H 10350 4900 50  0001 C CNN "Mouser"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R_Small R92
+L Device:R_Small R96
 U 1 1 5DAA40C5
 P 10650 5000
-F 0 "R92" H 10680 5020 50  0000 L CNN
+F 0 "R96" H 10680 5020 50  0000 L CNN
 F 1 "0R" H 10680 4960 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10650 5000 50  0001 C CNN
 F 3 "~" H 10650 5000 50  0001 C CNN
@@ -727,10 +727,10 @@ Connection ~ 10300 3600
 Text HLabel 10550 4000 2    50   Input ~ 0
 ADC_DVDD_3V3
 $Comp
-L power:GND #PWR0147
+L power:GND #PWR0144
 U 1 1 5DBB1C2F
 P 10550 4100
-F 0 "#PWR0147" H 10550 3850 50  0001 C CNN
+F 0 "#PWR0144" H 10550 3850 50  0001 C CNN
 F 1 "GND" H 10550 3950 50  0000 C CNN
 F 2 "" H 10550 4100 50  0001 C CNN
 F 3 "" H 10550 4100 50  0001 C CNN
@@ -771,10 +771,10 @@ ADC_VDD
 Text Label 10150 2400 0    50   ~ 0
 ADC_DVDD
 $Comp
-L Device:C_Small C117
+L Device:C_Small C116
 U 1 1 5DCB370F
 P 10600 2650
-F 0 "C117" H 10610 2720 50  0000 L CNN
+F 0 "C116" H 10610 2720 50  0000 L CNN
 F 1 "2.2 uF" H 10610 2570 50  0000 L CNN
 F 2 "" H 10600 2650 50  0001 C CNN
 F 3 "~" H 10600 2650 50  0001 C CNN
@@ -782,10 +782,10 @@ F 3 "~" H 10600 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C116
+L Device:C_Small C115
 U 1 1 5DCB39F9
 P 10150 2650
-F 0 "C116" H 10160 2720 50  0000 L CNN
+F 0 "C115" H 10160 2720 50  0000 L CNN
 F 1 "0.1 uF" H 10160 2570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 10150 2650 50  0001 C CNN
 F 3 "~" H 10150 2650 50  0001 C CNN
@@ -794,10 +794,10 @@ F 4 "80-C0402C104M4P" H 10150 2650 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0148
+L power:GND #PWR0145
 U 1 1 5DCB4392
 P 10600 2850
-F 0 "#PWR0148" H 10600 2600 50  0001 C CNN
+F 0 "#PWR0145" H 10600 2600 50  0001 C CNN
 F 1 "GND" H 10600 2700 50  0000 C CNN
 F 2 "" H 10600 2850 50  0001 C CNN
 F 3 "" H 10600 2850 50  0001 C CNN
@@ -818,10 +818,10 @@ Wire Wire Line
 Wire Wire Line
 	10150 2850 10150 2750
 $Comp
-L power:GND #PWR0144
+L power:GND #PWR0141
 U 1 1 5DCC75D7
 P 10150 2850
-F 0 "#PWR0144" H 10150 2600 50  0001 C CNN
+F 0 "#PWR0141" H 10150 2600 50  0001 C CNN
 F 1 "GND" H 10150 2700 50  0000 C CNN
 F 2 "" H 10150 2850 50  0001 C CNN
 F 3 "" H 10150 2850 50  0001 C CNN
@@ -829,10 +829,10 @@ F 3 "" H 10150 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C115
+L Device:C_Small C114
 U 1 1 5DCC9D99
 P 9600 2650
-F 0 "C115" H 9610 2720 50  0000 L CNN
+F 0 "C114" H 9610 2720 50  0000 L CNN
 F 1 "2.2 uF" H 9610 2570 50  0000 L CNN
 F 2 "" H 9600 2650 50  0001 C CNN
 F 3 "~" H 9600 2650 50  0001 C CNN
@@ -840,10 +840,10 @@ F 3 "~" H 9600 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C114
+L Device:C_Small C113
 U 1 1 5DCC9D9F
 P 9150 2650
-F 0 "C114" H 9160 2720 50  0000 L CNN
+F 0 "C113" H 9160 2720 50  0000 L CNN
 F 1 "0.1 uF" H 9160 2570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 2650 50  0001 C CNN
 F 3 "~" H 9150 2650 50  0001 C CNN
@@ -852,10 +852,10 @@ F 4 "80-C0402C104M4P" H 9150 2650 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0142
+L power:GND #PWR0139
 U 1 1 5DCC9DA5
 P 9600 2850
-F 0 "#PWR0142" H 9600 2600 50  0001 C CNN
+F 0 "#PWR0139" H 9600 2600 50  0001 C CNN
 F 1 "GND" H 9600 2700 50  0000 C CNN
 F 2 "" H 9600 2850 50  0001 C CNN
 F 3 "" H 9600 2850 50  0001 C CNN
@@ -876,10 +876,10 @@ Wire Wire Line
 Wire Wire Line
 	9150 2850 9150 2750
 $Comp
-L power:GND #PWR0141
+L power:GND #PWR0138
 U 1 1 5DCC9DB2
 P 9150 2850
-F 0 "#PWR0141" H 9150 2600 50  0001 C CNN
+F 0 "#PWR0138" H 9150 2600 50  0001 C CNN
 F 1 "GND" H 9150 2700 50  0000 C CNN
 F 2 "" H 9150 2850 50  0001 C CNN
 F 3 "" H 9150 2850 50  0001 C CNN
@@ -1043,10 +1043,10 @@ Q_AMP_GND
 Text HLabel 6050 2200 0    50   Input ~ 0
 I_AMP_GND
 $Comp
-L power:GND #PWR0136
+L power:GND #PWR0133
 U 1 1 5D899C0D
 P 6150 2200
-F 0 "#PWR0136" H 6150 1950 50  0001 C CNN
+F 0 "#PWR0133" H 6150 1950 50  0001 C CNN
 F 1 "GND" H 6150 2050 50  0000 C CNN
 F 2 "" H 6150 2200 50  0001 C CNN
 F 3 "" H 6150 2200 50  0001 C CNN
@@ -1058,10 +1058,10 @@ Wire Wire Line
 Text HLabel 900  4350 0    50   Input ~ 0
 LNA_GND
 $Comp
-L power:GND #PWR0131
+L power:GND #PWR0128
 U 1 1 5D8B7DE1
 P 1050 4450
-F 0 "#PWR0131" H 1050 4200 50  0001 C CNN
+F 0 "#PWR0128" H 1050 4200 50  0001 C CNN
 F 1 "GND" H 1050 4300 50  0000 C CNN
 F 2 "" H 1050 4450 50  0001 C CNN
 F 3 "" H 1050 4450 50  0001 C CNN
@@ -1073,10 +1073,10 @@ Wire Wire Line
 Wire Wire Line
 	1050 4350 900  4350
 $Comp
-L power:GND #PWR0137
+L power:GND #PWR0134
 U 1 1 5D8C1256
 P 6250 5050
-F 0 "#PWR0137" H 6250 4800 50  0001 C CNN
+F 0 "#PWR0134" H 6250 4800 50  0001 C CNN
 F 1 "GND" H 6250 4900 50  0000 C CNN
 F 2 "" H 6250 5050 50  0001 C CNN
 F 3 "" H 6250 5050 50  0001 C CNN
@@ -1086,10 +1086,10 @@ $EndComp
 Wire Wire Line
 	6050 5050 6250 5050
 $Comp
-L power:GND #PWR0145
+L power:GND #PWR0142
 U 1 1 5D8D156B
 P 10450 5150
-F 0 "#PWR0145" H 10450 4900 50  0001 C CNN
+F 0 "#PWR0142" H 10450 4900 50  0001 C CNN
 F 1 "GND" H 10450 5000 50  0000 C CNN
 F 2 "" H 10450 5150 50  0001 C CNN
 F 3 "" H 10450 5150 50  0001 C CNN
@@ -1101,10 +1101,10 @@ Wire Wire Line
 Text HLabel 10650 5350 2    50   Input ~ 0
 ADC_GND2
 $Comp
-L power:GND #PWR0146
+L power:GND #PWR0143
 U 1 1 5D8DE44C
 P 10450 5350
-F 0 "#PWR0146" H 10450 5100 50  0001 C CNN
+F 0 "#PWR0143" H 10450 5100 50  0001 C CNN
 F 1 "GND" H 10450 5200 50  0000 C CNN
 F 2 "" H 10450 5350 50  0001 C CNN
 F 3 "" H 10450 5350 50  0001 C CNN
@@ -1114,10 +1114,10 @@ $EndComp
 Wire Wire Line
 	10450 5350 10650 5350
 $Comp
-L Device:R_Small R80
+L Device:R_Small R84
 U 1 1 5DC881F5
 P 4350 3600
-F 0 "R80" H 4380 3620 50  0000 L CNN
+F 0 "R84" H 4380 3620 50  0000 L CNN
 F 1 "50R 0603" H 4380 3560 50  0000 L CNN
 F 2 "" H 4350 3600 50  0001 C CNN
 F 3 "~" H 4350 3600 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/receiver.sch-bak b/pcb/discrete/discrete-rf-board/receiver.sch-bak
index 316c958..f55650a 100644
--- a/pcb/discrete/discrete-rf-board/receiver.sch-bak
+++ b/pcb/discrete/discrete-rf-board/receiver.sch-bak
@@ -241,8 +241,9 @@ U 1 1 5D9C48D2
 P 7550 3850
 F 0 "R82" H 7580 3870 50  0000 L CNN
 F 1 "10kR" H 7580 3810 50  0000 L CNN
-F 2 "" H 7550 3850 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7550 3850 50  0001 C CNN
 F 3 "~" H 7550 3850 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7550 3850 50  0001 C CNN "Mouser"
 	1    7550 3850
 	1    0    0    -1  
 $EndComp
@@ -252,8 +253,9 @@ U 1 1 5D9C9C4F
 P 7950 3850
 F 0 "R84" H 7980 3870 50  0000 L CNN
 F 1 "10kR" H 7980 3810 50  0000 L CNN
-F 2 "" H 7950 3850 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7950 3850 50  0001 C CNN
 F 3 "~" H 7950 3850 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7950 3850 50  0001 C CNN "Mouser"
 	1    7950 3850
 	1    0    0    -1  
 $EndComp
@@ -316,8 +318,9 @@ U 1 1 5D9D617C
 P 7550 2450
 F 0 "R81" H 7580 2470 50  0000 L CNN
 F 1 "10kR" H 7580 2410 50  0000 L CNN
-F 2 "" H 7550 2450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7550 2450 50  0001 C CNN
 F 3 "~" H 7550 2450 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7550 2450 50  0001 C CNN "Mouser"
 	1    7550 2450
 	1    0    0    -1  
 $EndComp
@@ -327,8 +330,9 @@ U 1 1 5D9D6182
 P 7950 2450
 F 0 "R83" H 7980 2470 50  0000 L CNN
 F 1 "10kR" H 7980 2410 50  0000 L CNN
-F 2 "" H 7950 2450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 7950 2450 50  0001 C CNN
 F 3 "~" H 7950 2450 50  0001 C CNN
+F 4 "603-AC0402FR-1310KL" H 7950 2450 50  0001 C CNN "Mouser"
 	1    7950 2450
 	1    0    0    -1  
 $EndComp
@@ -783,8 +787,9 @@ U 1 1 5DCB39F9
 P 10150 2650
 F 0 "C116" H 10160 2720 50  0000 L CNN
 F 1 "0.1 uF" H 10160 2570 50  0000 L CNN
-F 2 "" H 10150 2650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 10150 2650 50  0001 C CNN
 F 3 "~" H 10150 2650 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 10150 2650 50  0001 C CNN "Mouser"
 	1    10150 2650
 	1    0    0    -1  
 $EndComp
@@ -840,8 +845,9 @@ U 1 1 5DCC9D9F
 P 9150 2650
 F 0 "C114" H 9160 2720 50  0000 L CNN
 F 1 "0.1 uF" H 9160 2570 50  0000 L CNN
-F 2 "" H 9150 2650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 2650 50  0001 C CNN
 F 3 "~" H 9150 2650 50  0001 C CNN
+F 4 "80-C0402C104M4P" H 9150 2650 50  0001 C CNN "Mouser"
 	1    9150 2650
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
index 11bf5bf..0059e5b 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
@@ -35,9 +35,9 @@ L Device:R_Small R?
 U 1 1 5D4B1FCA
 P 4850 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FCA" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R147"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R150"  Part="1" 
-F 0 "R150" H 4880 3320 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R154"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R157"  Part="1" 
+F 0 "R157" H 4880 3320 50  0000 L CNN
 F 1 "R_Small" H 4880 3260 50  0000 L CNN
 F 2 "" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
@@ -49,9 +49,9 @@ L Device:R_Small R?
 U 1 1 5D4B1FD0
 P 5200 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD0" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R149"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R152"  Part="1" 
-F 0 "R152" H 5230 3320 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R156"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R159"  Part="1" 
+F 0 "R159" H 5230 3320 50  0000 L CNN
 F 1 "R_Small" H 5230 3260 50  0000 L CNN
 F 2 "" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
@@ -63,9 +63,9 @@ L Device:R_Small R?
 U 1 1 5D4B1FD6
 P 5050 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD6" Ref="R?"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R148"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R151"  Part="1" 
-F 0 "R151" H 5080 3720 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R155"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R158"  Part="1" 
+F 0 "R158" H 5080 3720 50  0000 L CNN
 F 1 "R_Small" H 5080 3660 50  0000 L CNN
 F 2 "" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
@@ -183,12 +183,12 @@ Connection ~ 3950 2650
 Wire Wire Line
 	3950 2650 6000 2650
 $Comp
-L Device:C_Small C190
+L Device:C_Small C192
 U 1 1 5D4BC42E
 P 4200 2150
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C190"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C196"  Part="1" 
-F 0 "C196" H 4210 2220 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C192"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C198"  Part="1" 
+F 0 "C198" H 4210 2220 50  0000 L CNN
 F 1 "100 pF" H 4210 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4200 2150 50  0001 C CNN
 F 3 "~" H 4200 2150 50  0001 C CNN
@@ -197,12 +197,12 @@ F 4 "791-RF15N101J250CT " H 4200 2150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C191
+L Device:C_Small C193
 U 1 1 5D4BC853
 P 4550 2150
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C191"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C197"  Part="1" 
-F 0 "C197" H 4560 2220 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C193"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C199"  Part="1" 
+F 0 "C199" H 4560 2220 50  0000 L CNN
 F 1 "1 nF" H 4560 2070 50  0000 L CNN
 F 2 "" H 4550 2150 50  0001 C CNN
 F 3 "~" H 4550 2150 50  0001 C CNN
@@ -210,12 +210,12 @@ F 3 "~" H 4550 2150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C192
+L Device:C_Small C194
 U 1 1 5D4BCC70
 P 4900 2150
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C192"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C198"  Part="1" 
-F 0 "C198" H 4910 2220 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C194"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C200"  Part="1" 
+F 0 "C200" H 4910 2220 50  0000 L CNN
 F 1 "0.01 uF" H 4910 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4900 2150 50  0001 C CNN
 F 3 "~" H 4900 2150 50  0001 C CNN
@@ -224,12 +224,12 @@ F 4 "80-C0402C103K4R7411" H 4900 2150 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C193
+L Device:C_Small C195
 U 1 1 5D4BED00
 P 6250 2200
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C193"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C199"  Part="1" 
-F 0 "C199" H 6260 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C195"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C201"  Part="1" 
+F 0 "C201" H 6260 2270 50  0000 L CNN
 F 1 "100 pF" H 6260 2120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6250 2200 50  0001 C CNN
 F 3 "~" H 6250 2200 50  0001 C CNN
@@ -238,12 +238,12 @@ F 4 "791-RF15N101J250CT " H 6250 2200 50  0001 C CNN "Mouser"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C194
+L Device:C_Small C196
 U 1 1 5D4BED06
 P 6600 2200
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C194"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C200"  Part="1" 
-F 0 "C200" H 6610 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C196"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C202"  Part="1" 
+F 0 "C202" H 6610 2270 50  0000 L CNN
 F 1 "1 nF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -251,12 +251,12 @@ F 3 "~" H 6600 2200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C195
+L Device:C_Small C197
 U 1 1 5D4BED0C
 P 6950 2200
-AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C195"  Part="1" 
-AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C201"  Part="1" 
-F 0 "C201" H 6960 2270 50  0000 L CNN
+AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C197"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C203"  Part="1" 
+F 0 "C203" H 6960 2270 50  0000 L CNN
 F 1 "0.01 uF" H 6960 2120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6950 2200 50  0001 C CNN
 F 3 "~" H 6950 2200 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
index 20aac61..a725626 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
@@ -22,7 +22,7 @@ AR Path="/5D4B1FC3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FC3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FC3" Ref="U18"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FC3" Ref="U20"  Part="1" 
-F 0 "U20" H 4000 3750 50  0000 C CNN
+F 0 "U18" H 4000 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 4400 2850 50  0000 C CNN
 F 2 "discrete_footprints:Infineon_TSLP-6-4" H 3950 3300 50  0001 C CNN
 F 3 "" H 3950 3300 50  0001 C CNN
@@ -37,7 +37,7 @@ P 4850 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FCA" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R147"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R150"  Part="1" 
-F 0 "R150" H 4880 3320 50  0000 L CNN
+F 0 "R147" H 4880 3320 50  0000 L CNN
 F 1 "R_Small" H 4880 3260 50  0000 L CNN
 F 2 "" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
@@ -51,7 +51,7 @@ P 5200 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD0" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R149"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R152"  Part="1" 
-F 0 "R152" H 5230 3320 50  0000 L CNN
+F 0 "R149" H 5230 3320 50  0000 L CNN
 F 1 "R_Small" H 5230 3260 50  0000 L CNN
 F 2 "" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
@@ -65,7 +65,7 @@ P 5050 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD6" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R148"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R151"  Part="1" 
-F 0 "R151" H 5080 3720 50  0000 L CNN
+F 0 "R148" H 5080 3720 50  0000 L CNN
 F 1 "R_Small" H 5080 3660 50  0000 L CNN
 F 2 "" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
@@ -81,7 +81,7 @@ P 3950 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FDD" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FDD" Ref="#PWR0238"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FDD" Ref="#PWR0247"  Part="1" 
-F 0 "#PWR0247" H 3950 3650 50  0001 C CNN
+F 0 "#PWR0238" H 3950 3650 50  0001 C CNN
 F 1 "GND" H 3950 3750 50  0000 C CNN
 F 2 "" H 3950 3900 50  0001 C CNN
 F 3 "" H 3950 3900 50  0001 C CNN
@@ -99,7 +99,7 @@ P 5050 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FE5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FE5" Ref="#PWR0242"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FE5" Ref="#PWR0251"  Part="1" 
-F 0 "#PWR0251" H 5050 3650 50  0001 C CNN
+F 0 "#PWR0242" H 5050 3650 50  0001 C CNN
 F 1 "GND" H 5050 3750 50  0000 C CNN
 F 2 "" H 5050 3900 50  0001 C CNN
 F 3 "" H 5050 3900 50  0001 C CNN
@@ -126,7 +126,7 @@ P 6000 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B2001" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B2001" Ref="#PWR0243"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B2001" Ref="#PWR0252"  Part="1" 
-F 0 "#PWR0252" H 6000 3650 50  0001 C CNN
+F 0 "#PWR0243" H 6000 3650 50  0001 C CNN
 F 1 "GND" H 6000 3750 50  0000 C CNN
 F 2 "" H 6000 3900 50  0001 C CNN
 F 3 "" H 6000 3900 50  0001 C CNN
@@ -143,7 +143,7 @@ AR Path="/5D4B1FF8" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FF8" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FF8" Ref="U19"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FF8" Ref="U21"  Part="1" 
-F 0 "U21" H 6050 3750 50  0000 C CNN
+F 0 "U19" H 6050 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 6450 2850 50  0000 C CNN
 F 2 "discrete_footprints:Infineon_TSLP-6-4" H 6000 3300 50  0001 C CNN
 F 3 "" H 6000 3300 50  0001 C CNN
@@ -188,7 +188,7 @@ U 1 1 5D4BC42E
 P 4200 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C190"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C196"  Part="1" 
-F 0 "C196" H 4210 2220 50  0000 L CNN
+F 0 "C190" H 4210 2220 50  0000 L CNN
 F 1 "100 pF" H 4210 2070 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4200 2150 50  0001 C CNN
 F 3 "~" H 4200 2150 50  0001 C CNN
@@ -202,7 +202,7 @@ U 1 1 5D4BC853
 P 4550 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C191"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C197"  Part="1" 
-F 0 "C197" H 4560 2220 50  0000 L CNN
+F 0 "C191" H 4560 2220 50  0000 L CNN
 F 1 "1 nF" H 4560 2070 50  0000 L CNN
 F 2 "" H 4550 2150 50  0001 C CNN
 F 3 "~" H 4550 2150 50  0001 C CNN
@@ -215,10 +215,11 @@ U 1 1 5D4BCC70
 P 4900 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C192"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C198"  Part="1" 
-F 0 "C198" H 4910 2220 50  0000 L CNN
+F 0 "C192" H 4910 2220 50  0000 L CNN
 F 1 "0.01 uF" H 4910 2070 50  0000 L CNN
-F 2 "" H 4900 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 4900 2150 50  0001 C CNN
 F 3 "~" H 4900 2150 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 4900 2150 50  0001 C CNN "Mouser"
 	1    4900 2150
 	1    0    0    -1  
 $EndComp
@@ -228,7 +229,7 @@ U 1 1 5D4BED00
 P 6250 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C193"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C199"  Part="1" 
-F 0 "C199" H 6260 2270 50  0000 L CNN
+F 0 "C193" H 6260 2270 50  0000 L CNN
 F 1 "100 pF" H 6260 2120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6250 2200 50  0001 C CNN
 F 3 "~" H 6250 2200 50  0001 C CNN
@@ -242,7 +243,7 @@ U 1 1 5D4BED06
 P 6600 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C194"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C200"  Part="1" 
-F 0 "C200" H 6610 2270 50  0000 L CNN
+F 0 "C194" H 6610 2270 50  0000 L CNN
 F 1 "1 nF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -255,10 +256,11 @@ U 1 1 5D4BED0C
 P 6950 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C195"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C201"  Part="1" 
-F 0 "C201" H 6960 2270 50  0000 L CNN
+F 0 "C195" H 6960 2270 50  0000 L CNN
 F 1 "0.01 uF" H 6960 2120 50  0000 L CNN
-F 2 "" H 6950 2200 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6950 2200 50  0001 C CNN
 F 3 "~" H 6950 2200 50  0001 C CNN
+F 4 "80-C0402C103K4R7411" H 6950 2200 50  0001 C CNN "Mouser"
 	1    6950 2200
 	1    0    0    -1  
 $EndComp
@@ -268,7 +270,7 @@ U 1 1 5D4BF277
 P 6950 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF277" Ref="#PWR0246"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF277" Ref="#PWR0255"  Part="1" 
-F 0 "#PWR0255" H 6950 2150 50  0001 C CNN
+F 0 "#PWR0246" H 6950 2150 50  0001 C CNN
 F 1 "GND" H 6950 2250 50  0000 C CNN
 F 2 "" H 6950 2400 50  0001 C CNN
 F 3 "" H 6950 2400 50  0001 C CNN
@@ -281,7 +283,7 @@ U 1 1 5D4BF7E8
 P 6600 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF7E8" Ref="#PWR0245"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF7E8" Ref="#PWR0254"  Part="1" 
-F 0 "#PWR0254" H 6600 2150 50  0001 C CNN
+F 0 "#PWR0245" H 6600 2150 50  0001 C CNN
 F 1 "GND" H 6600 2250 50  0000 C CNN
 F 2 "" H 6600 2400 50  0001 C CNN
 F 3 "" H 6600 2400 50  0001 C CNN
@@ -294,7 +296,7 @@ U 1 1 5D4BFA67
 P 6250 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BFA67" Ref="#PWR0244"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BFA67" Ref="#PWR0253"  Part="1" 
-F 0 "#PWR0253" H 6250 2150 50  0001 C CNN
+F 0 "#PWR0244" H 6250 2150 50  0001 C CNN
 F 1 "GND" H 6250 2250 50  0000 C CNN
 F 2 "" H 6250 2400 50  0001 C CNN
 F 3 "" H 6250 2400 50  0001 C CNN
@@ -330,7 +332,7 @@ U 1 1 5D4C425B
 P 4900 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C425B" Ref="#PWR0241"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C425B" Ref="#PWR0250"  Part="1" 
-F 0 "#PWR0250" H 4900 2100 50  0001 C CNN
+F 0 "#PWR0241" H 4900 2100 50  0001 C CNN
 F 1 "GND" H 4900 2200 50  0000 C CNN
 F 2 "" H 4900 2350 50  0001 C CNN
 F 3 "" H 4900 2350 50  0001 C CNN
@@ -343,7 +345,7 @@ U 1 1 5D4C4261
 P 4550 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4261" Ref="#PWR0240"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4261" Ref="#PWR0249"  Part="1" 
-F 0 "#PWR0249" H 4550 2100 50  0001 C CNN
+F 0 "#PWR0240" H 4550 2100 50  0001 C CNN
 F 1 "GND" H 4550 2200 50  0000 C CNN
 F 2 "" H 4550 2350 50  0001 C CNN
 F 3 "" H 4550 2350 50  0001 C CNN
@@ -356,7 +358,7 @@ U 1 1 5D4C4267
 P 4200 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4267" Ref="#PWR0239"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4267" Ref="#PWR0248"  Part="1" 
-F 0 "#PWR0248" H 4200 2100 50  0001 C CNN
+F 0 "#PWR0239" H 4200 2100 50  0001 C CNN
 F 1 "GND" H 4200 2200 50  0000 C CNN
 F 2 "" H 4200 2350 50  0001 C CNN
 F 3 "" H 4200 2350 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/transmitter.sch b/pcb/discrete/discrete-rf-board/transmitter.sch
index 1b0234c..637b4c5 100644
--- a/pcb/discrete/discrete-rf-board/transmitter.sch
+++ b/pcb/discrete/discrete-rf-board/transmitter.sch
@@ -82,10 +82,10 @@ Wire Wire Line
 	6750 3450 6750 3350
 Connection ~ 6750 3350
 $Comp
-L power:GND #PWR026
+L power:GND #PWR022
 U 1 1 5D7F5C8F
 P 7550 4150
-F 0 "#PWR026" H 7550 3900 50  0001 C CNN
+F 0 "#PWR022" H 7550 3900 50  0001 C CNN
 F 1 "GND" H 7550 4000 50  0000 C CNN
 F 2 "" H 7550 4150 50  0001 C CNN
 F 3 "" H 7550 4150 50  0001 C CNN
@@ -221,10 +221,10 @@ Connection ~ 1200 3700
 Wire Wire Line
 	1200 3700 1250 3700
 $Comp
-L power:GND #PWR020
+L power:GND #PWR016
 U 1 1 5D8C821A
 P 1200 4050
-F 0 "#PWR020" H 1200 3800 50  0001 C CNN
+F 0 "#PWR016" H 1200 3800 50  0001 C CNN
 F 1 "GND" H 1200 3900 50  0000 C CNN
 F 2 "" H 1200 4050 50  0001 C CNN
 F 3 "" H 1200 4050 50  0001 C CNN
@@ -234,10 +234,10 @@ $EndComp
 Wire Wire Line
 	1200 4050 1200 3950
 $Comp
-L power:GND #PWR021
+L power:GND #PWR017
 U 1 1 5D8C8A04
 P 1550 4050
-F 0 "#PWR021" H 1550 3800 50  0001 C CNN
+F 0 "#PWR017" H 1550 3800 50  0001 C CNN
 F 1 "GND" H 1550 3900 50  0000 C CNN
 F 2 "" H 1550 4050 50  0001 C CNN
 F 3 "" H 1550 4050 50  0001 C CNN
@@ -247,10 +247,10 @@ $EndComp
 Wire Wire Line
 	1550 4050 1550 3950
 $Comp
-L power:GND #PWR022
+L power:GND #PWR018
 U 1 1 5D8C95C0
 P 1950 4300
-F 0 "#PWR022" H 1950 4050 50  0001 C CNN
+F 0 "#PWR018" H 1950 4050 50  0001 C CNN
 F 1 "GND" H 1950 4150 50  0000 C CNN
 F 2 "" H 1950 4300 50  0001 C CNN
 F 3 "" H 1950 4300 50  0001 C CNN
@@ -260,10 +260,10 @@ $EndComp
 Wire Wire Line
 	1950 4300 1950 4200
 $Comp
-L power:GND #PWR023
+L power:GND #PWR019
 U 1 1 5D8CA782
 P 2500 4200
-F 0 "#PWR023" H 2500 3950 50  0001 C CNN
+F 0 "#PWR019" H 2500 3950 50  0001 C CNN
 F 1 "GND" H 2500 4050 50  0000 C CNN
 F 2 "" H 2500 4200 50  0001 C CNN
 F 3 "" H 2500 4200 50  0001 C CNN
@@ -405,10 +405,10 @@ Wire Wire Line
 Wire Wire Line
 	7800 3550 8000 3550
 $Comp
-L power:GND #PWR027
+L power:GND #PWR023
 U 1 1 5DCABC6C
 P 8200 4050
-F 0 "#PWR027" H 8200 3800 50  0001 C CNN
+F 0 "#PWR023" H 8200 3800 50  0001 C CNN
 F 1 "GND" H 8200 3900 50  0000 C CNN
 F 2 "" H 8200 4050 50  0001 C CNN
 F 3 "" H 8200 4050 50  0001 C CNN
@@ -416,10 +416,10 @@ F 3 "" H 8200 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR028
+L power:GND #PWR024
 U 1 1 5DCABEC4
 P 8600 4050
-F 0 "#PWR028" H 8600 3800 50  0001 C CNN
+F 0 "#PWR024" H 8600 3800 50  0001 C CNN
 F 1 "GND" H 8600 3900 50  0000 C CNN
 F 2 "" H 8600 4050 50  0001 C CNN
 F 3 "" H 8600 4050 50  0001 C CNN
@@ -433,10 +433,10 @@ Wire Wire Line
 Text HLabel 10550 2700 2    50   Input ~ 0
 PA_GND
 $Comp
-L power:GND #PWR029
+L power:GND #PWR025
 U 1 1 5D8EC555
 P 10400 2700
-F 0 "#PWR029" H 10400 2450 50  0001 C CNN
+F 0 "#PWR025" H 10400 2450 50  0001 C CNN
 F 1 "GND" H 10400 2550 50  0000 C CNN
 F 2 "" H 10400 2700 50  0001 C CNN
 F 3 "" H 10400 2700 50  0001 C CNN
@@ -448,10 +448,10 @@ Wire Wire Line
 Text HLabel 6050 1900 2    50   Input ~ 0
 I_MIX_GND
 $Comp
-L power:GND #PWR025
+L power:GND #PWR021
 U 1 1 5D8EF6D5
 P 5800 1900
-F 0 "#PWR025" H 5800 1650 50  0001 C CNN
+F 0 "#PWR021" H 5800 1650 50  0001 C CNN
 F 1 "GND" H 5800 1750 50  0000 C CNN
 F 2 "" H 5800 1900 50  0001 C CNN
 F 3 "" H 5800 1900 50  0001 C CNN
@@ -463,10 +463,10 @@ Wire Wire Line
 Text HLabel 6050 3600 2    50   Input ~ 0
 Q_MIX_GND
 $Comp
-L power:GND #PWR024
+L power:GND #PWR020
 U 1 1 5D8F1675
 P 5750 3600
-F 0 "#PWR024" H 5750 3350 50  0001 C CNN
+F 0 "#PWR020" H 5750 3350 50  0001 C CNN
 F 1 "GND" H 5750 3450 50  0000 C CNN
 F 2 "" H 5750 3600 50  0001 C CNN
 F 3 "" H 5750 3600 50  0001 C CNN