diff --git a/rf-analyzer/rf-analyzer.sch b/rf-analyzer/rf-analyzer.sch
index 0daa32911731ed4399dc461a278b434ea93701ef..674d245bae72d9082c756e8914bdc44986a6ea3f 100644
--- a/rf-analyzer/rf-analyzer.sch
+++ b/rf-analyzer/rf-analyzer.sch
@@ -16,282 +16,247 @@ $EndDescr
 $Comp
 L Device:R_Small R33
 U 1 1 596FDF71
-P 10300 1850
-F 0 "R33" V 10200 1800 50  0000 L CNN
-F 1 "510Ω" V 10400 1750 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10300 1850 50  0001 C CNN
-F 3 "" H 10300 1850 50  0001 C CNN
-	1    10300 1850
+P 10200 1700
+F 0 "R33" V 10100 1650 50  0000 L CNN
+F 1 "510Ω" V 10300 1600 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10200 1700 50  0001 C CNN
+F 3 "" H 10200 1700 50  0001 C CNN
+	1    10200 1700
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R_Small R34
 U 1 1 596FEB83
-P 10600 1250
-F 0 "R34" V 10500 1200 50  0000 L CNN
-F 1 "49.9Ω" V 10700 1150 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10600 1250 50  0001 C CNN
-F 3 "" H 10600 1250 50  0001 C CNN
-	1    10600 1250
+P 10500 1100
+F 0 "R34" V 10400 1050 50  0000 L CNN
+F 1 "49.9Ω" V 10600 1000 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10500 1100 50  0001 C CNN
+F 3 "" H 10500 1100 50  0001 C CNN
+	1    10500 1100
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C_Small C23
 U 1 1 596FF084
-P 10200 850
-F 0 "C23" V 10300 800 50  0000 L CNN
-F 1 "100nF" V 10100 750 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10200 850 50  0001 C CNN
-F 3 "" H 10200 850 50  0001 C CNN
-	1    10200 850 
+P 10100 700
+F 0 "C23" V 10200 650 50  0000 L CNN
+F 1 "100nF" V 10000 600 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10100 700 50  0001 C CNN
+F 3 "" H 10100 700 50  0001 C CNN
+	1    10100 700 
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R_Small R32
 U 1 1 59705BB2
-P 9350 1850
-F 0 "R32" V 9250 1800 50  0000 L CNN
-F 1 "470Ω" V 9450 1750 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9350 1850 50  0001 C CNN
-F 3 "" H 9350 1850 50  0001 C CNN
-	1    9350 1850
+P 9250 1700
+F 0 "R32" V 9150 1650 50  0000 L CNN
+F 1 "470Ω" V 9350 1600 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9250 1700 50  0001 C CNN
+F 3 "" H 9250 1700 50  0001 C CNN
+	1    9250 1700
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C_Small C21
 U 1 1 59705C59
-P 9100 1500
-F 0 "C21" H 9200 1500 50  0000 L CNN
-F 1 "100nF" H 9150 1600 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9100 1500 50  0001 C CNN
-F 3 "" H 9100 1500 50  0001 C CNN
-	1    9100 1500
+P 9000 1350
+F 0 "C21" H 9100 1350 50  0000 L CNN
+F 1 "100nF" H 9050 1450 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9000 1350 50  0001 C CNN
+F 3 "" H 9000 1350 50  0001 C CNN
+	1    9000 1350
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C_Small C22
 U 1 1 59706A4C
-P 9600 1350
-F 0 "C22" H 9700 1350 50  0000 L CNN
-F 1 "50pF" H 9650 1450 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9600 1350 50  0001 C CNN
-F 3 "" H 9600 1350 50  0001 C CNN
-	1    9600 1350
+P 9500 1200
+F 0 "C22" H 9600 1200 50  0000 L CNN
+F 1 "50pF" H 9550 1300 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9500 1200 50  0001 C CNN
+F 3 "" H 9500 1200 50  0001 C CNN
+	1    9500 1200
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R_Small R31
 U 1 1 59706B15
-P 9250 1150
-F 0 "R31" V 9150 1100 50  0000 L CNN
-F 1 "100Ω" V 9350 1050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9250 1150 50  0001 C CNN
-F 3 "" H 9250 1150 50  0001 C CNN
-	1    9250 1150
+P 9150 1000
+F 0 "R31" V 9050 950 50  0000 L CNN
+F 1 "100Ω" V 9250 900 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9150 1000 50  0001 C CNN
+F 3 "" H 9150 1000 50  0001 C CNN
+	1    9150 1000
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R_Small R30
 U 1 1 59707359
-P 8750 1350
-F 0 "R30" H 8850 1300 50  0000 L CNN
-F 1 "22Ω" H 8800 1400 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8750 1350 50  0001 C CNN
-F 3 "" H 8750 1350 50  0001 C CNN
-	1    8750 1350
+P 7000 1600
+F 0 "R30" H 7100 1550 50  0000 L CNN
+F 1 "22Ω" H 7050 1650 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7000 1600 50  0001 C CNN
+F 3 "" H 7000 1600 50  0001 C CNN
+	1    7000 1600
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R_Small R29
 U 1 1 597076A4
-P 8350 1150
-F 0 "R29" V 8250 1100 50  0000 L CNN
-F 1 "33Ω" V 8450 1050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8350 1150 50  0001 C CNN
-F 3 "" H 8350 1150 50  0001 C CNN
-	1    8350 1150
+P 6600 1400
+F 0 "R29" V 6500 1350 50  0000 L CNN
+F 1 "33Ω" V 6700 1300 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6600 1400 50  0001 C CNN
+F 3 "" H 6600 1400 50  0001 C CNN
+	1    6600 1400
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C_Small C18
 U 1 1 59707E9F
-P 8050 1150
-F 0 "C18" V 8150 1100 50  0000 L CNN
-F 1 "10nF" V 7950 1050 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8050 1150 50  0001 C CNN
-F 3 "" H 8050 1150 50  0001 C CNN
-	1    8050 1150
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:C_Small C17
-U 1 1 59707F0B
-P 8050 800
-F 0 "C17" V 8150 750 50  0000 L CNN
-F 1 "100nF" V 7950 700 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8050 800 50  0001 C CNN
-F 3 "" H 8050 800 50  0001 C CNN
-	1    8050 800 
+P 6300 1400
+F 0 "C18" V 6400 1350 50  0000 L CNN
+F 1 "10nF" V 6200 1300 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6300 1400 50  0001 C CNN
+F 3 "" H 6300 1400 50  0001 C CNN
+	1    6300 1400
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C_Small C20
 U 1 1 59708773
-P 8750 1650
-F 0 "C20" H 8850 1650 50  0000 L CNN
-F 1 "10nF" H 8800 1750 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8750 1650 50  0001 C CNN
-F 3 "" H 8750 1650 50  0001 C CNN
-	1    8750 1650
+P 7000 1900
+F 0 "C20" H 7100 1900 50  0000 L CNN
+F 1 "10nF" H 7050 2000 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7000 1900 50  0001 C CNN
+F 3 "" H 7000 1900 50  0001 C CNN
+	1    7000 1900
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C_Small C19
 U 1 1 597087DD
-P 8450 1650
-F 0 "C19" H 8550 1650 50  0000 L CNN
-F 1 "100nF" H 8500 1750 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8450 1650 50  0001 C CNN
-F 3 "" H 8450 1650 50  0001 C CNN
-	1    8450 1650
+P 6700 1900
+F 0 "C19" H 6800 1900 50  0000 L CNN
+F 1 "100nF" H 6750 2000 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6700 1900 50  0001 C CNN
+F 3 "" H 6700 1900 50  0001 C CNN
+	1    6700 1900
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R_Small R28
 U 1 1 597088B3
-P 8100 1650
-F 0 "R28" H 8200 1600 50  0000 L CNN
-F 1 "1KΩ" H 8150 1700 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8100 1650 50  0001 C CNN
-F 3 "" H 8100 1650 50  0001 C CNN
-	1    8100 1650
+P 6350 1900
+F 0 "R28" H 6450 1850 50  0000 L CNN
+F 1 "1KΩ" H 6400 1950 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6350 1900 50  0001 C CNN
+F 3 "" H 6350 1900 50  0001 C CNN
+	1    6350 1900
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R_Small R27
 U 1 1 59708D55
-P 7750 1500
-F 0 "R27" V 7650 1450 50  0000 L CNN
-F 1 "1KΩ" V 7850 1400 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7750 1500 50  0001 C CNN
-F 3 "" H 7750 1500 50  0001 C CNN
-	1    7750 1500
+P 6000 1750
+F 0 "R27" V 5900 1700 50  0000 L CNN
+F 1 "1KΩ" V 6100 1650 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6000 1750 50  0001 C CNN
+F 3 "" H 6000 1750 50  0001 C CNN
+	1    6000 1750
 	0    1    1    0   
 $EndComp
 $Comp
 L power:+5V #PWR0102
 U 1 1 59708EF1
-P 7550 1450
-F 0 "#PWR0102" H 7550 1300 50  0001 C CNN
-F 1 "+5V" H 7550 1590 50  0000 C CNN
-F 2 "" H 7550 1450 50  0001 C CNN
-F 3 "" H 7550 1450 50  0001 C CNN
-	1    7550 1450
+P 5800 1700
+F 0 "#PWR0102" H 5800 1550 50  0001 C CNN
+F 1 "+5V" H 5800 1840 50  0000 C CNN
+F 2 "" H 5800 1700 50  0001 C CNN
+F 3 "" H 5800 1700 50  0001 C CNN
+	1    5800 1700
 	1    0    0    -1  
 $EndComp
-Text GLabel 10750 1250 2    60   Input ~ 0
+Text GLabel 10650 1100 2    60   Input ~ 0
 fwd_shft
-Text GLabel 7800 950  0    60   Input ~ 0
-fwd_preshft
-Text Notes 7250 600  0    60   ~ 0
+Text Notes 8300 600  0    60   ~ 0
 Phase Shifter
 $Comp
 L Device:D_Schottky_Small_ALT D1
 U 1 1 5970BBB4
-P 5850 900
-F 0 "D1" H 5800 800 50  0000 L CNN
-F 1 "1N5711" H 5700 1000 50  0000 L CNN
-F 2 "Diode_SMD:D_SMA" V 5850 900 50  0001 C CNN
-F 3 "" V 5850 900 50  0001 C CNN
-	1    5850 900 
+P 9850 2300
+F 0 "D1" H 9800 2200 50  0000 L CNN
+F 1 "1N5711" H 9700 2400 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 9850 2300 50  0001 C CNN
+F 3 "" V 9850 2300 50  0001 C CNN
+	1    9850 2300
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C13
 U 1 1 5970BF1F
-P 6100 1100
-F 0 "C13" H 6200 1100 50  0000 L CNN
-F 1 "100nF" H 6150 1200 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6100 1100 50  0001 C CNN
-F 3 "" H 6100 1100 50  0001 C CNN
-	1    6100 1100
+P 10100 2500
+F 0 "C13" H 10200 2500 50  0000 L CNN
+F 1 "100nF" H 10150 2600 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10100 2500 50  0001 C CNN
+F 3 "" H 10100 2500 50  0001 C CNN
+	1    10100 2500
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C_Small C15
 U 1 1 5970C0BE
-P 6550 1100
-F 0 "C15" H 6650 1100 50  0000 L CNN
-F 1 "100nF" H 6600 1200 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6550 1100 50  0001 C CNN
-F 3 "" H 6550 1100 50  0001 C CNN
-	1    6550 1100
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R23
-U 1 1 5970C178
-P 5700 1100
-F 0 "R23" H 5800 1050 50  0000 L CNN
-F 1 "51Ω" H 5750 1150 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5700 1100 50  0001 C CNN
-F 3 "" H 5700 1100 50  0001 C CNN
-	1    5700 1100
+P 10550 2500
+F 0 "C15" H 10650 2500 50  0000 L CNN
+F 1 "100nF" H 10600 2600 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10550 2500 50  0001 C CNN
+F 3 "" H 10550 2500 50  0001 C CNN
+	1    10550 2500
 	-1   0    0    1   
 $EndComp
-Text GLabel 5600 900  0    60   Input ~ 0
-fwd_env
-Text GLabel 6650 900  2    60   Input ~ 0
+Text GLabel 9700 2300 0    60   Input ~ 0
+fwd_sig
+Text GLabel 10650 2300 2    60   Input ~ 0
 fwd_pwr
 $Comp
 L Device:D_Schottky_Small_ALT D2
 U 1 1 5970EE87
-P 5900 1800
-F 0 "D2" H 5850 1700 50  0000 L CNN
-F 1 "1N5711" H 5750 1900 50  0000 L CNN
-F 2 "Diode_SMD:D_SMA" V 5900 1800 50  0001 C CNN
-F 3 "" V 5900 1800 50  0001 C CNN
-	1    5900 1800
+P 9900 3200
+F 0 "D2" H 9850 3100 50  0000 L CNN
+F 1 "1N5711" H 9750 3300 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 9900 3200 50  0001 C CNN
+F 3 "" V 9900 3200 50  0001 C CNN
+	1    9900 3200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C14
 U 1 1 5970EE8D
-P 6150 2000
-F 0 "C14" H 6250 2000 50  0000 L CNN
-F 1 "100nF" H 6200 2100 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6150 2000 50  0001 C CNN
-F 3 "" H 6150 2000 50  0001 C CNN
-	1    6150 2000
+P 10150 3400
+F 0 "C14" H 10250 3400 50  0000 L CNN
+F 1 "100nF" H 10200 3500 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10150 3400 50  0001 C CNN
+F 3 "" H 10150 3400 50  0001 C CNN
+	1    10150 3400
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C_Small C16
 U 1 1 5970EE93
-P 6600 2000
-F 0 "C16" H 6700 2000 50  0000 L CNN
-F 1 "100nF" H 6650 2100 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6600 2000 50  0001 C CNN
-F 3 "" H 6600 2000 50  0001 C CNN
-	1    6600 2000
+P 10600 3400
+F 0 "C16" H 10700 3400 50  0000 L CNN
+F 1 "100nF" H 10650 3500 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10600 3400 50  0001 C CNN
+F 3 "" H 10600 3400 50  0001 C CNN
+	1    10600 3400
 	-1   0    0    1   
 $EndComp
-$Comp
-L Device:R_Small R24
-U 1 1 5970EE99
-P 5750 2000
-F 0 "R24" H 5850 1950 50  0000 L CNN
-F 1 "51Ω" H 5800 2050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5750 2000 50  0001 C CNN
-F 3 "" H 5750 2000 50  0001 C CNN
-	1    5750 2000
-	-1   0    0    1   
-$EndComp
-Text GLabel 5600 1800 0    60   Input ~ 0
-refl_env
-Text GLabel 6700 1800 2    60   Input ~ 0
+Text GLabel 9750 3200 0    60   Input ~ 0
+refl_sig
+Text GLabel 10700 3200 2    60   Input ~ 0
 refl_pwr
-Text Notes 5100 600  0    60   ~ 0
+Text Notes 9350 2000 0    60   ~ 0
 Envelope Detector
 $Comp
 L Device:C_Small C1
@@ -338,28 +303,6 @@ F 3 "" H 950 2150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R_Small R2
-U 1 1 59712961
-P 800 2000
-F 0 "R2" H 900 1950 50  0000 L CNN
-F 1 "52.3Ω" H 850 2050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 800 2000 50  0001 C CNN
-F 3 "" H 800 2000 50  0001 C CNN
-	1    800  2000
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R1
-U 1 1 59712CC8
-P 800 1400
-F 0 "R1" H 900 1350 50  0000 L CNN
-F 1 "52.3Ω" H 850 1450 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 800 1400 50  0001 C CNN
-F 3 "" H 800 1400 50  0001 C CNN
-	1    800  1400
-	-1   0    0    1   
-$EndComp
-$Comp
 L Device:C_Small C6
 U 1 1 59713489
 P 1800 1050
@@ -390,9 +333,9 @@ NoConn ~ 2300 2000
 Text GLabel 2300 1700 2    60   Input ~ 0
 vref
 Text GLabel 800  1200 1    60   Input ~ 0
-fwd_ref
+fwd_sig
 Text GLabel 800  2200 3    60   Input ~ 0
-refl_ref
+refl_sig
 $Comp
 L Device:C_Small C7
 U 1 1 59715D9B
@@ -438,28 +381,6 @@ F 3 "" H 3050 2150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R_Small R22
-U 1 1 59715DBF
-P 2900 2000
-F 0 "R22" H 3000 1950 50  0000 L CNN
-F 1 "52.3Ω" H 2950 2050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2900 2000 50  0001 C CNN
-F 3 "" H 2900 2000 50  0001 C CNN
-	1    2900 2000
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R21
-U 1 1 59715DC5
-P 2900 1400
-F 0 "R21" H 3000 1350 50  0000 L CNN
-F 1 "52.3Ω" H 2950 1450 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2900 1400 50  0001 C CNN
-F 3 "" H 2900 1400 50  0001 C CNN
-	1    2900 1400
-	-1   0    0    1   
-$EndComp
-$Comp
 L power:GND #PWR0104
 U 1 1 59715DCB
 P 2750 1700
@@ -503,216 +424,118 @@ shft_vref
 Text GLabel 2900 1200 1    60   Input ~ 0
 fwd_shft
 Text GLabel 2900 2200 3    60   Input ~ 0
-refl_shft
+refl_sig
 Text Notes 550  700  0    60   ~ 0
 180 Phase &\nMagnitude Detectors
-$Comp
-L Device:R_Small R3
-U 1 1 59729D5C
-P 8250 3400
-F 0 "R3" V 8150 3350 50  0000 L CNN
-F 1 "16.9Ω" V 8350 3300 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8250 3400 50  0001 C CNN
-F 3 "" H 8250 3400 50  0001 C CNN
-	1    8250 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R5
-U 1 1 5972A3C6
-P 8550 3200
-F 0 "R5" V 8450 3150 50  0000 L CNN
-F 1 "16.5Ω" V 8650 3100 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8550 3200 50  0001 C CNN
-F 3 "" H 8550 3200 50  0001 C CNN
-	1    8550 3200
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R6
-U 1 1 5972A5A8
-P 8550 3550
-F 0 "R6" V 8450 3500 50  0000 L CNN
-F 1 "16.5Ω" V 8650 3450 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8550 3550 50  0001 C CNN
-F 3 "" H 8550 3550 50  0001 C CNN
-	1    8550 3550
-	0    1    1    0   
-$EndComp
-Text GLabel 8700 3200 2    60   Input ~ 0
-fwd_env
-$Comp
-L Device:R_Small R11
-U 1 1 5972DB17
-P 9200 3550
-F 0 "R11" V 9100 3500 50  0000 L CNN
-F 1 "115Ω" V 9300 3450 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9200 3550 50  0001 C CNN
-F 3 "" H 9200 3550 50  0001 C CNN
-	1    9200 3550
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R9
-U 1 1 5972E28B
-P 9050 3800
-F 0 "R9" H 9150 3750 50  0000 L CNN
-F 1 "52.3Ω" H 9100 3850 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9050 3800 50  0001 C CNN
-F 3 "" H 9050 3800 50  0001 C CNN
-	1    9050 3800
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R13
-U 1 1 5972E725
-P 9400 3800
-F 0 "R13" H 9500 3750 50  0000 L CNN
-F 1 "52.3Ω" H 9450 3850 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9400 3800 50  0001 C CNN
-F 3 "" H 9400 3800 50  0001 C CNN
-	1    9400 3800
-	-1   0    0    1   
-$EndComp
-Text Notes 8100 3200 0    47   ~ 0
-Power\nSplitter
-Text Notes 8850 4250 0    60   ~ 0
-8dB Attenuator
-Wire Wire Line
-	10000 800  10000 850 
-Wire Wire Line
-	10100 950  10100 900 
+Text GLabel 7350 900  2    60   Input ~ 0
+fwd_sig
 Wire Wire Line
-	10100 900  10000 900 
-Connection ~ 10000 900 
+	9900 650  9900 700 
 Wire Wire Line
-	10100 850  10000 850 
-Connection ~ 10000 850 
+	10000 800  10000 750 
 Wire Wire Line
-	10300 850  10400 850 
+	10000 750  9900 750 
+Connection ~ 9900 750 
 Wire Wire Line
-	10400 850  10400 900 
+	10000 700  9900 700 
+Connection ~ 9900 700 
 Wire Wire Line
-	10400 1850 10450 1850
+	10200 700  10300 700 
 Wire Wire Line
-	10450 1850 10450 1250
+	10300 700  10300 750 
 Wire Wire Line
-	9450 1850 9750 1850
+	10300 1700 10350 1700
 Wire Wire Line
-	9750 1850 9750 1350
+	10350 1700 10350 1100
 Wire Wire Line
-	9750 1350 9800 1350
+	9350 1700 9650 1700
 Wire Wire Line
-	10000 1600 10000 1550
-Connection ~ 9750 1850
+	9650 1700 9650 1200
 Wire Wire Line
-	9600 1450 9600 1500
+	9650 1200 9700 1200
 Wire Wire Line
-	9350 1150 9600 1150
+	9900 1450 9900 1400
+Connection ~ 9650 1700
 Wire Wire Line
-	9100 1150 9100 1400
+	9500 1300 9500 1350
 Wire Wire Line
-	8450 1150 8750 1150
+	9250 1000 9500 1000
 Wire Wire Line
-	9100 1600 9100 1850
+	9000 1000 9000 1250
 Wire Wire Line
-	9100 1850 9250 1850
-Connection ~ 9100 1150
+	6700 1400 7000 1400
 Wire Wire Line
-	8150 1150 8200 1150
+	9000 1450 9000 1700
 Wire Wire Line
-	8150 800  8200 800 
+	9000 1700 9150 1700
 Wire Wire Line
-	8200 800  8200 1150
-Connection ~ 8200 1150
+	6150 1400 6200 1400
 Wire Wire Line
-	7900 1150 7950 1150
+	10300 1100 10350 1100
+Connection ~ 10350 1100
 Wire Wire Line
-	7900 800  7900 950 
+	7000 1500 7000 1400
+Connection ~ 7000 1400
 Wire Wire Line
-	7900 800  7950 800 
+	7000 1700 7000 1750
 Wire Wire Line
-	10400 1250 10450 1250
-Connection ~ 10450 1250
+	7000 2000 7000 2050
 Wire Wire Line
-	8750 1250 8750 1150
-Connection ~ 8750 1150
+	6700 2050 6700 2000
 Wire Wire Line
-	8750 1450 8750 1500
+	6350 2050 6350 2000
 Wire Wire Line
-	8750 1750 8750 1800
+	6700 1750 6700 1800
 Wire Wire Line
-	8450 1800 8450 1750
+	6100 1750 6350 1750
+Connection ~ 7000 1750
 Wire Wire Line
-	8100 1800 8100 1750
+	6350 1800 6350 1750
+Connection ~ 6700 1750
+Connection ~ 6350 1750
 Wire Wire Line
-	8450 1500 8450 1550
+	5900 1750 5800 1750
 Wire Wire Line
-	7850 1500 8100 1500
-Connection ~ 8750 1500
-Wire Wire Line
-	8100 1550 8100 1500
-Connection ~ 8450 1500
-Connection ~ 8100 1500
-Wire Wire Line
-	7650 1500 7550 1500
-Wire Wire Line
-	7550 1500 7550 1450
-Wire Wire Line
-	7800 950  7900 950 
-Connection ~ 7900 950 
+	5800 1750 5800 1700
 Wire Notes Line
-	7200 500  7200 2400
+	8250 650  8950 650 
 Wire Notes Line
-	7200 650  7900 650 
-Wire Notes Line
-	7900 650  7900 500 
-Wire Wire Line
-	9600 1250 9600 1150
-Connection ~ 9600 1150
-Wire Wire Line
-	6550 1200 6550 1250
+	8950 650  8950 500 
 Wire Wire Line
-	6100 1200 6100 1250
+	9500 1100 9500 1000
+Connection ~ 9500 1000
 Wire Wire Line
-	5700 1200 5700 1250
+	10550 2600 10550 2650
 Wire Wire Line
-	5700 1000 5700 900 
+	10100 2600 10100 2650
 Wire Wire Line
-	5600 900  5700 900 
+	9950 2300 10100 2300
 Wire Wire Line
-	5950 900  6100 900 
+	10100 2400 10100 2300
+Connection ~ 10100 2300
 Wire Wire Line
-	6100 1000 6100 900 
-Connection ~ 6100 900 
+	10400 2300 10550 2300
 Wire Wire Line
-	6400 900  6550 900 
+	10550 2300 10550 2400
+Connection ~ 10550 2300
 Wire Wire Line
-	6550 900  6550 1000
-Connection ~ 5700 900 
-Connection ~ 6550 900 
+	10600 3500 10600 3550
 Wire Wire Line
-	6600 2100 6600 2150
+	10150 3500 10150 3550
 Wire Wire Line
-	6150 2100 6150 2150
+	10000 3200 10150 3200
 Wire Wire Line
-	5750 2100 5750 2150
+	10150 3300 10150 3200
+Connection ~ 10150 3200
 Wire Wire Line
-	5750 1900 5750 1800
+	10450 3200 10600 3200
 Wire Wire Line
-	6000 1800 6150 1800
-Wire Wire Line
-	6150 1900 6150 1800
-Connection ~ 6150 1800
-Wire Wire Line
-	6450 1800 6600 1800
-Wire Wire Line
-	6600 1800 6600 1900
-Connection ~ 6600 1800
+	10600 3200 10600 3300
+Connection ~ 10600 3200
 Wire Notes Line
-	5050 650  6000 650 
+	9250 2050 10200 2050
 Wire Notes Line
-	6000 650  6000 500 
+	10200 2050 10200 1900
 Wire Wire Line
 	1250 1550 1200 1550
 Wire Wire Line
@@ -739,16 +562,10 @@ Wire Wire Line
 	1200 2150 1050 2150
 Wire Wire Line
 	800  1200 800  1250
-Wire Wire Line
-	800  1500 800  1550
 Wire Wire Line
 	800  1550 850  1550
 Wire Wire Line
 	800  1850 850  1850
-Wire Wire Line
-	800  2100 800  2150
-Connection ~ 800  1850
-Connection ~ 800  1550
 Wire Wire Line
 	650  1700 800  1700
 Connection ~ 800  1700
@@ -828,16 +645,10 @@ Wire Wire Line
 	3300 2150 3150 2150
 Wire Wire Line
 	2900 1200 2900 1250
-Wire Wire Line
-	2900 1500 2900 1550
 Wire Wire Line
 	2900 1550 2950 1550
 Wire Wire Line
 	2900 1850 2950 1850
-Wire Wire Line
-	2900 2100 2900 2150
-Connection ~ 2900 1850
-Connection ~ 2900 1550
 Wire Wire Line
 	2750 1700 2900 1700
 Connection ~ 2900 1700
@@ -893,291 +704,18 @@ Wire Notes Line
 	1550 750  500  750 
 Wire Wire Line
 	850  1250 800  1250
-Connection ~ 800  1250
 Wire Wire Line
 	850  2150 800  2150
-Connection ~ 800  2150
 Wire Wire Line
 	2950 1250 2900 1250
-Connection ~ 2900 1250
 Wire Wire Line
 	2950 2150 2900 2150
-Connection ~ 2900 2150
 Wire Notes Line
 	500  2650 5050 2650
 Wire Notes Line
 	5050 2650 5050 500 
 Wire Wire Line
-	8350 3400 8400 3400
-Wire Wire Line
-	8400 3200 8400 3400
-Wire Wire Line
-	8400 3200 8450 3200
-Wire Wire Line
-	8400 3550 8450 3550
-Connection ~ 8400 3400
-Wire Wire Line
-	5600 1800 5750 1800
-Connection ~ 5750 1800
-Wire Wire Line
-	8650 3200 8700 3200
-Wire Notes Line
-	8100 3050 8700 3050
-Wire Notes Line
-	8700 3050 8700 3750
-Wire Notes Line
-	8700 3750 8100 3750
-Wire Notes Line
-	8100 3750 8100 3050
-Wire Wire Line
-	9050 3700 9050 3550
-Wire Wire Line
-	8650 3550 9050 3550
-Wire Wire Line
-	9300 3550 9400 3550
-Wire Wire Line
-	9400 3550 9400 3700
-Wire Wire Line
-	9050 3900 9050 3950
-Wire Notes Line
-	8750 3400 8750 4300
-Wire Notes Line
-	8750 3400 9550 3400
-Wire Notes Line
-	9550 3400 9550 4300
-Wire Notes Line
-	9550 4300 8750 4300
-Connection ~ 9050 3550
-$Comp
-L Device:R_Small R15
-U 1 1 597301E9
-P 9750 3550
-F 0 "R15" V 9650 3500 50  0000 L CNN
-F 1 "16.9Ω" V 9850 3450 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9750 3550 50  0001 C CNN
-F 3 "" H 9750 3550 50  0001 C CNN
-	1    9750 3550
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R17
-U 1 1 597301EF
-P 10050 3350
-F 0 "R17" V 9950 3300 50  0000 L CNN
-F 1 "16.5Ω" V 10150 3250 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10050 3350 50  0001 C CNN
-F 3 "" H 10050 3350 50  0001 C CNN
-	1    10050 3350
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R18
-U 1 1 597301F5
-P 10050 3700
-F 0 "R18" V 9950 3650 50  0000 L CNN
-F 1 "16.5Ω" V 10150 3600 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10050 3700 50  0001 C CNN
-F 3 "" H 10050 3700 50  0001 C CNN
-	1    10050 3700
-	0    1    1    0   
-$EndComp
-Text Notes 9600 3350 0    47   ~ 0
-Power\nSplitter
-Wire Wire Line
-	9850 3550 9900 3550
-Wire Wire Line
-	9900 3350 9900 3550
-Wire Wire Line
-	9900 3350 9950 3350
-Wire Wire Line
-	9900 3700 9950 3700
-Connection ~ 9900 3550
-Wire Notes Line
-	9600 3200 10200 3200
-Wire Notes Line
-	10200 3200 10200 3900
-Wire Notes Line
-	10200 3900 9600 3900
-Wire Notes Line
-	9600 3900 9600 3200
-Connection ~ 9400 3550
-Text GLabel 10250 3350 2    60   Input ~ 0
-fwd_ref
-Text GLabel 10350 3600 2    60   Input ~ 0
-fwd_preshft
-Wire Notes Line
-	7200 2050 11200 2050
-Wire Notes Line
-	7200 2400 5050 2400
-Wire Wire Line
-	10750 1250 10700 1250
-$Comp
-L Device:R_Small R4
-U 1 1 5973684A
-P 8250 4750
-F 0 "R4" V 8150 4700 50  0000 L CNN
-F 1 "16.9Ω" V 8350 4650 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8250 4750 50  0001 C CNN
-F 3 "" H 8250 4750 50  0001 C CNN
-	1    8250 4750
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R7
-U 1 1 59736850
-P 8550 4550
-F 0 "R7" V 8450 4500 50  0000 L CNN
-F 1 "16.5Ω" V 8650 4450 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8550 4550 50  0001 C CNN
-F 3 "" H 8550 4550 50  0001 C CNN
-	1    8550 4550
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R8
-U 1 1 59736856
-P 8550 4900
-F 0 "R8" V 8450 4850 50  0000 L CNN
-F 1 "16.5Ω" V 8650 4800 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 8550 4900 50  0001 C CNN
-F 3 "" H 8550 4900 50  0001 C CNN
-	1    8550 4900
-	0    1    1    0   
-$EndComp
-Text GLabel 8700 4550 2    60   Input ~ 0
-refl_env
-$Comp
-L Device:R_Small R12
-U 1 1 5973685E
-P 9200 4900
-F 0 "R12" V 9100 4850 50  0000 L CNN
-F 1 "115Ω" V 9300 4800 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9200 4900 50  0001 C CNN
-F 3 "" H 9200 4900 50  0001 C CNN
-	1    9200 4900
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R10
-U 1 1 59736864
-P 9050 5150
-F 0 "R10" H 9150 5100 50  0000 L CNN
-F 1 "52.3Ω" H 9100 5200 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9050 5150 50  0001 C CNN
-F 3 "" H 9050 5150 50  0001 C CNN
-	1    9050 5150
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R14
-U 1 1 5973686A
-P 9400 5150
-F 0 "R14" H 9500 5100 50  0000 L CNN
-F 1 "52.3Ω" H 9450 5200 50  0000 L CNN
-F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" H 9400 5150 50  0001 C CNN
-F 3 "" H 9400 5150 50  0001 C CNN
-	1    9400 5150
-	-1   0    0    1   
-$EndComp
-Text Notes 8100 4550 0    47   ~ 0
-Power\nSplitter
-Text Notes 8850 5600 0    60   ~ 0
-8dB Attenuator
-Wire Wire Line
-	8350 4750 8400 4750
-Wire Wire Line
-	8400 4550 8400 4750
-Wire Wire Line
-	8400 4550 8450 4550
-Wire Wire Line
-	8400 4900 8450 4900
-Connection ~ 8400 4750
-Wire Wire Line
-	8650 4550 8700 4550
-Wire Notes Line
-	8100 4400 8700 4400
-Wire Notes Line
-	8700 4400 8700 5100
-Wire Notes Line
-	8700 5100 8100 5100
-Wire Notes Line
-	8100 5100 8100 4400
-Wire Wire Line
-	9050 5050 9050 4900
-Wire Wire Line
-	8650 4900 9050 4900
-Wire Wire Line
-	9300 4900 9400 4900
-Wire Wire Line
-	9400 4900 9400 5050
-Wire Wire Line
-	9050 5250 9050 5300
-Wire Wire Line
-	9400 5250 9400 5300
-Wire Notes Line
-	8750 4750 8750 5650
-Wire Notes Line
-	8750 4750 9550 4750
-Wire Notes Line
-	9550 4750 9550 5650
-Connection ~ 9050 4900
-$Comp
-L Device:R_Small R16
-U 1 1 59736894
-P 9750 4900
-F 0 "R16" V 9650 4850 50  0000 L CNN
-F 1 "16.9Ω" V 9850 4800 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9750 4900 50  0001 C CNN
-F 3 "" H 9750 4900 50  0001 C CNN
-	1    9750 4900
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R19
-U 1 1 5973689A
-P 10050 4700
-F 0 "R19" V 9950 4650 50  0000 L CNN
-F 1 "16.5Ω" V 10150 4600 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10050 4700 50  0001 C CNN
-F 3 "" H 10050 4700 50  0001 C CNN
-	1    10050 4700
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R_Small R20
-U 1 1 597368A0
-P 10050 5050
-F 0 "R20" V 9950 5000 50  0000 L CNN
-F 1 "16.5Ω" V 10150 4950 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10050 5050 50  0001 C CNN
-F 3 "" H 10050 5050 50  0001 C CNN
-	1    10050 5050
-	0    1    1    0   
-$EndComp
-Text Notes 9600 4700 0    47   ~ 0
-Power\nSplitter
-Wire Wire Line
-	9850 4900 9900 4900
-Wire Wire Line
-	9900 4700 9900 4900
-Wire Wire Line
-	9900 4700 9950 4700
-Wire Wire Line
-	9900 5050 9950 5050
-Connection ~ 9900 4900
-Wire Notes Line
-	9600 4550 10200 4550
-Wire Notes Line
-	10200 4550 10200 5250
-Wire Notes Line
-	10200 5250 9600 5250
-Wire Notes Line
-	9600 5250 9600 4550
-Connection ~ 9400 4900
-Text GLabel 10250 4700 2    60   Input ~ 0
-refl_ref
-Text GLabel 10250 5050 2    60   Input ~ 0
-refl_shft
+	10650 1100 10600 1100
 Text GLabel 5150 6200 0    60   Input ~ 0
 fwd_pwr
 Text GLabel 5150 6800 0    60   Input ~ 0
@@ -1194,8 +732,6 @@ Text GLabel 5150 6500 0    60   Input ~ 0
 vref
 Text GLabel 5150 6650 0    60   Input ~ 0
 phase
-Wire Wire Line
-	9400 3950 9400 3900
 Wire Wire Line
 	3750 700  3750 750 
 Connection ~ 3750 750 
@@ -1217,41 +753,33 @@ Wire Wire Line
 Wire Wire Line
 	5350 6800 5150 6800
 Wire Wire Line
-	10000 900  10000 950 
-Wire Wire Line
-	10000 850  10000 900 
-Wire Wire Line
-	9750 1850 10200 1850
-Wire Wire Line
-	9100 1150 9150 1150
+	9900 750  9900 800 
 Wire Wire Line
-	8200 1150 8250 1150
+	9900 700  9900 750 
 Wire Wire Line
-	10450 1250 10500 1250
+	9650 1700 10100 1700
 Wire Wire Line
-	8750 1150 9100 1150
+	9000 1000 9050 1000
 Wire Wire Line
-	8750 1500 8750 1550
+	10350 1100 10400 1100
 Wire Wire Line
-	8450 1500 8750 1500
+	7000 1400 7350 1400
 Wire Wire Line
-	8100 1500 8450 1500
+	7000 1750 7000 1800
 Wire Wire Line
-	7900 950  7900 1150
+	6700 1750 7000 1750
 Wire Wire Line
-	9600 1150 9800 1150
+	6350 1750 6700 1750
 Wire Wire Line
-	6100 900  6200 900 
+	9500 1000 9700 1000
 Wire Wire Line
-	5700 900  5750 900 
+	10100 2300 10200 2300
 Wire Wire Line
-	6550 900  6650 900 
+	10550 2300 10650 2300
 Wire Wire Line
-	6150 1800 6250 1800
+	10150 3200 10250 3200
 Wire Wire Line
-	6600 1800 6700 1800
-Wire Wire Line
-	800  1850 800  1900
+	10600 3200 10700 3200
 Wire Wire Line
 	800  1550 800  1700
 Wire Wire Line
@@ -1268,8 +796,6 @@ Wire Wire Line
 	2100 1850 2100 1900
 Wire Wire Line
 	1650 2200 1700 2200
-Wire Wire Line
-	2900 1850 2900 1900
 Wire Wire Line
 	2900 1550 2900 1700
 Wire Wire Line
@@ -1282,32 +808,10 @@ Wire Wire Line
 	4200 1850 4200 1900
 Wire Wire Line
 	3750 2200 3800 2200
-Wire Wire Line
-	800  1250 800  1300
 Wire Wire Line
 	800  2150 800  2200
-Wire Wire Line
-	2900 1250 2900 1300
 Wire Wire Line
 	2900 2150 2900 2200
-Wire Wire Line
-	8400 3400 8400 3550
-Wire Wire Line
-	5750 1800 5800 1800
-Wire Wire Line
-	9050 3550 9100 3550
-Wire Wire Line
-	9900 3550 9900 3700
-Wire Wire Line
-	9400 3550 9650 3550
-Wire Wire Line
-	8400 4750 8400 4900
-Wire Wire Line
-	9050 4900 9100 4900
-Wire Wire Line
-	9900 4900 9900 5050
-Wire Wire Line
-	9400 4900 9650 4900
 Wire Wire Line
 	3750 750  3750 1050
 Wire Wire Line
@@ -1337,12 +841,12 @@ $EndComp
 $Comp
 L Amplifier_Operational_Freemo:OPA695 U3
 U 1 1 5C3F18FF
-P 10100 1250
-F 0 "U3" H 10150 1350 50  0000 L CNN
-F 1 "OPA695" H 10100 1100 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-6" H 10000 1300 50  0001 C CNN
-F 3 "" H 10200 1500 50  0001 C CNN
-	1    10100 1250
+P 10000 1100
+F 0 "U3" H 10050 1200 50  0000 L CNN
+F 1 "OPA695" H 10000 950 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-6" H 9900 1150 50  0001 C CNN
+F 3 "" H 10100 1350 50  0001 C CNN
+	1    10000 1100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1390,179 +894,113 @@ F 3 "" H 4200 1100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDA #PWR0112
-U 1 1 5C552F1C
-P 5700 1250
-F 0 "#PWR0112" H 5700 1000 50  0001 C CNN
-F 1 "GNDA" H 5705 1077 50  0000 C CNN
-F 2 "" H 5700 1250 50  0001 C CNN
-F 3 "" H 5700 1250 50  0001 C CNN
-	1    5700 1250
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:GNDA #PWR0113
 U 1 1 5C552FF8
-P 6100 1250
-F 0 "#PWR0113" H 6100 1000 50  0001 C CNN
-F 1 "GNDA" H 6105 1077 50  0000 C CNN
-F 2 "" H 6100 1250 50  0001 C CNN
-F 3 "" H 6100 1250 50  0001 C CNN
-	1    6100 1250
+P 10100 2650
+F 0 "#PWR0113" H 10100 2400 50  0001 C CNN
+F 1 "GNDA" H 10105 2477 50  0000 C CNN
+F 2 "" H 10100 2650 50  0001 C CNN
+F 3 "" H 10100 2650 50  0001 C CNN
+	1    10100 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0114
 U 1 1 5C5530D4
-P 6550 1250
-F 0 "#PWR0114" H 6550 1000 50  0001 C CNN
-F 1 "GNDA" H 6555 1077 50  0000 C CNN
-F 2 "" H 6550 1250 50  0001 C CNN
-F 3 "" H 6550 1250 50  0001 C CNN
-	1    6550 1250
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR0115
-U 1 1 5C5531B0
-P 5750 2150
-F 0 "#PWR0115" H 5750 1900 50  0001 C CNN
-F 1 "GNDA" H 5755 1977 50  0000 C CNN
-F 2 "" H 5750 2150 50  0001 C CNN
-F 3 "" H 5750 2150 50  0001 C CNN
-	1    5750 2150
+P 10550 2650
+F 0 "#PWR0114" H 10550 2400 50  0001 C CNN
+F 1 "GNDA" H 10555 2477 50  0000 C CNN
+F 2 "" H 10550 2650 50  0001 C CNN
+F 3 "" H 10550 2650 50  0001 C CNN
+	1    10550 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0116
 U 1 1 5C55328C
-P 6150 2150
-F 0 "#PWR0116" H 6150 1900 50  0001 C CNN
-F 1 "GNDA" H 6155 1977 50  0000 C CNN
-F 2 "" H 6150 2150 50  0001 C CNN
-F 3 "" H 6150 2150 50  0001 C CNN
-	1    6150 2150
+P 10150 3550
+F 0 "#PWR0116" H 10150 3300 50  0001 C CNN
+F 1 "GNDA" H 10155 3377 50  0000 C CNN
+F 2 "" H 10150 3550 50  0001 C CNN
+F 3 "" H 10150 3550 50  0001 C CNN
+	1    10150 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0117
 U 1 1 5C553368
-P 6600 2150
-F 0 "#PWR0117" H 6600 1900 50  0001 C CNN
-F 1 "GNDA" H 6605 1977 50  0000 C CNN
-F 2 "" H 6600 2150 50  0001 C CNN
-F 3 "" H 6600 2150 50  0001 C CNN
-	1    6600 2150
+P 10600 3550
+F 0 "#PWR0117" H 10600 3300 50  0001 C CNN
+F 1 "GNDA" H 10605 3377 50  0000 C CNN
+F 2 "" H 10600 3550 50  0001 C CNN
+F 3 "" H 10600 3550 50  0001 C CNN
+	1    10600 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0118
 U 1 1 5C553444
-P 8100 1800
-F 0 "#PWR0118" H 8100 1550 50  0001 C CNN
-F 1 "GNDA" H 8105 1627 50  0000 C CNN
-F 2 "" H 8100 1800 50  0001 C CNN
-F 3 "" H 8100 1800 50  0001 C CNN
-	1    8100 1800
+P 6350 2050
+F 0 "#PWR0118" H 6350 1800 50  0001 C CNN
+F 1 "GNDA" H 6355 1877 50  0000 C CNN
+F 2 "" H 6350 2050 50  0001 C CNN
+F 3 "" H 6350 2050 50  0001 C CNN
+	1    6350 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0119
 U 1 1 5C553520
-P 8450 1800
-F 0 "#PWR0119" H 8450 1550 50  0001 C CNN
-F 1 "GNDA" H 8455 1627 50  0000 C CNN
-F 2 "" H 8450 1800 50  0001 C CNN
-F 3 "" H 8450 1800 50  0001 C CNN
-	1    8450 1800
+P 6700 2050
+F 0 "#PWR0119" H 6700 1800 50  0001 C CNN
+F 1 "GNDA" H 6705 1877 50  0000 C CNN
+F 2 "" H 6700 2050 50  0001 C CNN
+F 3 "" H 6700 2050 50  0001 C CNN
+	1    6700 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0120
 U 1 1 5C5535FC
-P 8750 1800
-F 0 "#PWR0120" H 8750 1550 50  0001 C CNN
-F 1 "GNDA" H 8755 1627 50  0000 C CNN
-F 2 "" H 8750 1800 50  0001 C CNN
-F 3 "" H 8750 1800 50  0001 C CNN
-	1    8750 1800
+P 7000 2050
+F 0 "#PWR0120" H 7000 1800 50  0001 C CNN
+F 1 "GNDA" H 7005 1877 50  0000 C CNN
+F 2 "" H 7000 2050 50  0001 C CNN
+F 3 "" H 7000 2050 50  0001 C CNN
+	1    7000 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0121
 U 1 1 5C5536D8
-P 9600 1500
-F 0 "#PWR0121" H 9600 1250 50  0001 C CNN
-F 1 "GNDA" H 9605 1327 50  0000 C CNN
-F 2 "" H 9600 1500 50  0001 C CNN
-F 3 "" H 9600 1500 50  0001 C CNN
-	1    9600 1500
+P 9500 1350
+F 0 "#PWR0121" H 9500 1100 50  0001 C CNN
+F 1 "GNDA" H 9505 1177 50  0000 C CNN
+F 2 "" H 9500 1350 50  0001 C CNN
+F 3 "" H 9500 1350 50  0001 C CNN
+	1    9500 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0122
 U 1 1 5C5537B4
-P 10000 1600
-F 0 "#PWR0122" H 10000 1350 50  0001 C CNN
-F 1 "GNDA" H 10005 1427 50  0000 C CNN
-F 2 "" H 10000 1600 50  0001 C CNN
-F 3 "" H 10000 1600 50  0001 C CNN
-	1    10000 1600
+P 9900 1450
+F 0 "#PWR0122" H 9900 1200 50  0001 C CNN
+F 1 "GNDA" H 9905 1277 50  0000 C CNN
+F 2 "" H 9900 1450 50  0001 C CNN
+F 3 "" H 9900 1450 50  0001 C CNN
+	1    9900 1450
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR0123
 U 1 1 5C553890
-P 10400 900
-F 0 "#PWR0123" H 10400 650 50  0001 C CNN
-F 1 "GNDA" H 10405 727 50  0000 C CNN
-F 2 "" H 10400 900 50  0001 C CNN
-F 3 "" H 10400 900 50  0001 C CNN
-	1    10400 900 
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR0124
-U 1 1 5C55396C
-P 9050 3950
-F 0 "#PWR0124" H 9050 3700 50  0001 C CNN
-F 1 "GNDA" H 9055 3777 50  0000 C CNN
-F 2 "" H 9050 3950 50  0001 C CNN
-F 3 "" H 9050 3950 50  0001 C CNN
-	1    9050 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR0125
-U 1 1 5C553A48
-P 9400 3950
-F 0 "#PWR0125" H 9400 3700 50  0001 C CNN
-F 1 "GNDA" H 9405 3777 50  0000 C CNN
-F 2 "" H 9400 3950 50  0001 C CNN
-F 3 "" H 9400 3950 50  0001 C CNN
-	1    9400 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR0126
-U 1 1 5C553B24
-P 9050 5300
-F 0 "#PWR0126" H 9050 5050 50  0001 C CNN
-F 1 "GNDA" H 9055 5127 50  0000 C CNN
-F 2 "" H 9050 5300 50  0001 C CNN
-F 3 "" H 9050 5300 50  0001 C CNN
-	1    9050 5300
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR0127
-U 1 1 5C553C00
-P 9400 5300
-F 0 "#PWR0127" H 9400 5050 50  0001 C CNN
-F 1 "GNDA" H 9405 5127 50  0000 C CNN
-F 2 "" H 9400 5300 50  0001 C CNN
-F 3 "" H 9400 5300 50  0001 C CNN
-	1    9400 5300
+P 10300 750
+F 0 "#PWR0123" H 10300 500 50  0001 C CNN
+F 1 "GNDA" H 10305 577 50  0000 C CNN
+F 2 "" H 10300 750 50  0001 C CNN
+F 3 "" H 10300 750 50  0001 C CNN
+	1    10300 750 
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1601,12 +1039,12 @@ $EndComp
 $Comp
 L power:+5V #PWR0105
 U 1 1 5C5E9076
-P 10000 800
-F 0 "#PWR0105" H 10000 650 50  0001 C CNN
-F 1 "+5V" H 10015 973 50  0000 C CNN
-F 2 "" H 10000 800 50  0001 C CNN
-F 3 "" H 10000 800 50  0001 C CNN
-	1    10000 800 
+P 9900 650
+F 0 "#PWR0105" H 9900 500 50  0001 C CNN
+F 1 "+5V" H 9915 823 50  0000 C CNN
+F 2 "" H 9900 650 50  0001 C CNN
+F 3 "" H 9900 650 50  0001 C CNN
+	1    9900 650 
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1634,75 +1072,71 @@ $EndComp
 $Comp
 L Connector:Conn_Coaxial J?
 U 1 1 5C66D0BD
-P 7850 3400
-F 0 "J?" H 7780 3638 50  0000 C CNN
-F 1 "Conn_Coaxial" H 7780 3547 50  0000 C CNN
-F 2 "Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical" H 7850 3400 50  0001 C CNN
-F 3 " ~" H 7850 3400 50  0001 C CNN
-	1    7850 3400
+P 5550 1200
+F 0 "J?" H 5480 1438 50  0000 C CNN
+F 1 "Conn_Coaxial" H 5480 1347 50  0000 C CNN
+F 2 "Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical" H 5550 1200 50  0001 C CNN
+F 3 " ~" H 5550 1200 50  0001 C CNN
+	1    5550 1200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_Coaxial J?
 U 1 1 5C66D2A2
-P 7850 4750
-F 0 "J?" H 7780 4988 50  0000 C CNN
-F 1 "Conn_Coaxial" H 7780 4897 50  0000 C CNN
-F 2 "Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical" H 7850 4750 50  0001 C CNN
-F 3 " ~" H 7850 4750 50  0001 C CNN
-	1    7850 4750
+P 7350 1750
+F 0 "J?" H 7280 1988 50  0000 C CNN
+F 1 "Conn_Coaxial" H 7280 1897 50  0000 C CNN
+F 2 "Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical" H 7350 1750 50  0001 C CNN
+F 3 " ~" H 7350 1750 50  0001 C CNN
+	1    7350 1750
 	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	8050 3400 8150 3400
-Wire Wire Line
-	8050 4750 8150 4750
 $Comp
 L power:GNDA #PWR?
 U 1 1 5C6BA158
-P 7850 5050
-F 0 "#PWR?" H 7850 4800 50  0001 C CNN
-F 1 "GNDA" H 7855 4877 50  0000 C CNN
-F 2 "" H 7850 5050 50  0001 C CNN
-F 3 "" H 7850 5050 50  0001 C CNN
-	1    7850 5050
+P 7350 2050
+F 0 "#PWR?" H 7350 1800 50  0001 C CNN
+F 1 "GNDA" H 7355 1877 50  0000 C CNN
+F 2 "" H 7350 2050 50  0001 C CNN
+F 3 "" H 7350 2050 50  0001 C CNN
+	1    7350 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR?
 U 1 1 5C6BA23D
-P 7850 3700
-F 0 "#PWR?" H 7850 3450 50  0001 C CNN
-F 1 "GNDA" H 7855 3527 50  0000 C CNN
-F 2 "" H 7850 3700 50  0001 C CNN
-F 3 "" H 7850 3700 50  0001 C CNN
-	1    7850 3700
+P 5550 1500
+F 0 "#PWR?" H 5550 1250 50  0001 C CNN
+F 1 "GNDA" H 5555 1327 50  0000 C CNN
+F 2 "" H 5550 1500 50  0001 C CNN
+F 3 "" H 5550 1500 50  0001 C CNN
+	1    5550 1500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7850 3600 7850 3700
+	5550 1400 5550 1500
 Wire Wire Line
-	7850 4950 7850 5050
+	7350 1950 7350 2050
 $Comp
 L Device:R_Small R?
 U 1 1 5C72DFC1
-P 6300 900
-F 0 "R?" V 6104 900 50  0000 C CNN
-F 1 "100kΩ" V 6195 900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6300 900 50  0001 C CNN
-F 3 "~" H 6300 900 50  0001 C CNN
-	1    6300 900 
+P 10300 2300
+F 0 "R?" V 10104 2300 50  0000 C CNN
+F 1 "100kΩ" V 10195 2300 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10300 2300 50  0001 C CNN
+F 3 "~" H 10300 2300 50  0001 C CNN
+	1    10300 2300
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R_Small R?
 U 1 1 5C72E0F0
-P 6350 1800
-F 0 "R?" V 6154 1800 50  0000 C CNN
-F 1 "100kΩ" V 6245 1800 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6350 1800 50  0001 C CNN
-F 3 "~" H 6350 1800 50  0001 C CNN
-	1    6350 1800
+P 10350 3200
+F 0 "R?" V 10154 3200 50  0000 C CNN
+F 1 "100kΩ" V 10245 3200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10350 3200 50  0001 C CNN
+F 3 "~" H 10350 3200 50  0001 C CNN
+	1    10350 3200
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1822,14 +1256,6 @@ F 3 "" H 5850 7050 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	5850 7000 5850 7050
-Wire Wire Line
-	10150 3350 10250 3350
-Wire Wire Line
-	10150 3700 10250 3700
-Wire Wire Line
-	10150 4700 10250 4700
-Wire Wire Line
-	10150 5050 10250 5050
 $Comp
 L Device:C_Small C?
 U 1 1 5CA135B0
@@ -1929,19 +1355,8 @@ Text GLabel 6350 6350 2    50   Input ~ 0
 SDA
 Text GLabel 6350 6150 2    50   Input ~ 0
 SCL
-Text GLabel 10350 3800 2    50   Input ~ 0
-freq_count
-Text GLabel 6550 4050 2    50   Input ~ 0
+Text GLabel 4350 5100 2    50   Input ~ 0
 freq_count
-Wire Wire Line
-	10250 3700 10250 3600
-Wire Wire Line
-	10250 3600 10350 3600
-Wire Wire Line
-	10250 3700 10250 3800
-Wire Wire Line
-	10250 3800 10350 3800
-Connection ~ 10250 3700
 $Comp
 L arduino:Arduino_Due_Shield XA?
 U 1 1 5D1108F7
@@ -1977,6 +1392,100 @@ Wire Wire Line
 	1100 4250 1100 4300
 Wire Wire Line
 	1100 4300 1050 4300
+Connection ~ 6450 1400
+Wire Wire Line
+	6450 1400 6500 1400
+Wire Wire Line
+	6400 1400 6450 1400
+Wire Wire Line
+	6150 1050 6200 1050
+Wire Wire Line
+	6450 1050 6450 1400
+Wire Wire Line
+	6400 1050 6450 1050
+$Comp
+L Device:C_Small C17
+U 1 1 59707F0B
+P 6300 1050
+F 0 "C17" V 6400 1000 50  0000 L CNN
+F 1 "100nF" V 6200 950 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6300 1050 50  0001 C CNN
+F 3 "" H 6300 1050 50  0001 C CNN
+	1    6300 1050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6150 1050 6150 1200
+Wire Wire Line
+	6150 1200 6050 1200
+Connection ~ 6150 1200
+Wire Wire Line
+	6150 1200 6150 1400
+Wire Wire Line
+	6050 1200 6050 900 
+Wire Wire Line
+	6050 900  7350 900 
+Connection ~ 6050 1200
+Wire Wire Line
+	6050 1200 5750 1200
+Text GLabel 7350 1400 2    60   Input ~ 0
+fwd_sig_dc
+$Comp
+L Device:R_Small R?
+U 1 1 5F8E4E50
+P 7650 1900
+F 0 "R?" H 7750 1850 50  0000 L CNN
+F 1 "50Ω" H 7700 1950 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7650 1900 50  0001 C CNN
+F 3 "" H 7650 1900 50  0001 C CNN
+	1    7650 1900
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5F9001F9
+P 7650 2050
+F 0 "#PWR?" H 7650 1800 50  0001 C CNN
+F 1 "GNDA" H 7655 1877 50  0000 C CNN
+F 2 "" H 7650 2050 50  0001 C CNN
+F 3 "" H 7650 2050 50  0001 C CNN
+	1    7650 2050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7550 1750 7650 1750
+Wire Wire Line
+	7650 1750 7650 1800
+Text GLabel 7750 1750 2    60   Input ~ 0
+refl_sig
+Wire Wire Line
+	7750 1750 7650 1750
+Connection ~ 7650 1750
+Wire Wire Line
+	7650 2000 7650 2050
+Wire Wire Line
+	9750 2300 9700 2300
+Wire Wire Line
+	9800 3200 9750 3200
+Text GLabel 8950 1000 0    60   Input ~ 0
+fwd_sig_dc
+Wire Wire Line
+	8950 1000 9000 1000
+Connection ~ 9000 1000
+Wire Notes Line
+	8250 1900 11200 1900
+Wire Notes Line
+	8250 2350 5050 2350
+Wire Notes Line
+	8250 2350 8250 500 
+Wire Notes Line
+	9250 1900 9250 3800
+Wire Notes Line
+	9250 3800 11200 3800
+Text Notes 5100 600  0    60   ~ 0
+Terminator & DC Coupling
+Wire Notes Line
+	5050 650  6350 650 
 Wire Notes Line
-	9550 5650 8750 5650
+	6350 650  6350 500 
 $EndSCHEMATC