diff --git a/rf-analyzer/rf-analyzer.sch b/rf-analyzer/rf-analyzer.sch
index fadf687f6cfcf15a77544480deb56f5b5377b340..0672f12858b1495272a58bd8c49163237c47847b 100644
--- a/rf-analyzer/rf-analyzer.sch
+++ b/rf-analyzer/rf-analyzer.sch
@@ -185,31 +185,20 @@ Phase Shifter
 $Comp
 L Device:D_Schottky_Small_ALT D?
 U 1 1 5970BBB4
-P 9850 2300
-F 0 "D?" 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
+P 10300 2300
+F 0 "D?" H 10250 2200 50  0000 L CNN
+F 1 "1N5711" H 10150 2400 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 10300 2300 50  0001 C CNN
+F 3 "" V 10300 2300 50  0001 C CNN
+	1    10300 2300
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C?
 U 1 1 5970BF1F
-P 10100 2500
-F 0 "C?" 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 C?
-U 1 1 5970C0BE
 P 10550 2500
 F 0 "C?" H 10650 2500 50  0000 L CNN
-F 1 "100nF" H 10600 2600 50  0000 L CNN
+F 1 "100nF" H 10250 2500 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
@@ -219,39 +208,6 @@ 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 D?
-U 1 1 5970EE87
-P 9900 3200
-F 0 "D?" 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 C?
-U 1 1 5970EE8D
-P 10150 3400
-F 0 "C?" 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 C?
-U 1 1 5970EE93
-P 10600 3400
-F 0 "C?" 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
 Text GLabel 9750 3200 0    60   Input ~ 0
 refl_sig
 Text GLabel 10700 3200 2    60   Input ~ 0
@@ -459,32 +415,11 @@ Wire Wire Line
 Connection ~ 9350 950 
 Wire Wire Line
 	10550 2600 10550 2650
-Wire Wire Line
-	10100 2600 10100 2650
-Wire Wire Line
-	9950 2300 10100 2300
-Wire Wire Line
-	10100 2400 10100 2300
-Connection ~ 10100 2300
 Wire Wire Line
 	10400 2300 10550 2300
 Wire Wire Line
-	10550 2300 10550 2400
+	10550 2400 10550 2300
 Connection ~ 10550 2300
-Wire Wire Line
-	10600 3500 10600 3550
-Wire Wire Line
-	10150 3500 10150 3550
-Wire Wire Line
-	10000 3200 10150 3200
-Wire Wire Line
-	10150 3300 10150 3200
-Connection ~ 10150 3200
-Wire Wire Line
-	10450 3200 10600 3200
-Wire Wire Line
-	10600 3200 10600 3300
-Connection ~ 10600 3200
 Wire Notes Line
 	9250 2050 10200 2050
 Wire Notes Line
@@ -709,14 +644,8 @@ Wire Wire Line
 	6150 1750 6500 1750
 Wire Wire Line
 	9350 950  9550 950 
-Wire Wire Line
-	10100 2300 10200 2300
 Wire Wire Line
 	10550 2300 10650 2300
-Wire Wire Line
-	10150 3200 10250 3200
-Wire Wire Line
-	10600 3200 10700 3200
 Wire Wire Line
 	800  1550 800  1700
 Wire Wire Line
@@ -829,19 +758,8 @@ $EndComp
 $Comp
 L power:GNDA #PWR0113
 U 1 1 5C552FF8
-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 10550 2650
-F 0 "#PWR0114" H 10550 2400 50  0001 C CNN
+F 0 "#PWR0113" 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
@@ -849,28 +767,6 @@ F 3 "" H 10550 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GNDA #PWR0116
-U 1 1 5C55328C
-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 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 6150 2050
@@ -1031,23 +927,12 @@ Wire Wire Line
 $Comp
 L Device:R_Small R?
 U 1 1 5C72DFC1
-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 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
+P 9900 2300
+F 0 "R?" V 9704 2300 50  0000 C CNN
+F 1 "100kΩ" V 9795 2300 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9900 2300 50  0001 C CNN
+F 3 "~" H 9900 2300 50  0001 C CNN
+	1    9900 2300
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1307,9 +1192,7 @@ Connection ~ 7450 1750
 Wire Wire Line
 	7450 2000 7450 2050
 Wire Wire Line
-	9750 2300 9700 2300
-Wire Wire Line
-	9800 3200 9750 3200
+	10200 2300 10150 2300
 Text GLabel 8800 950  0    60   Input ~ 0
 fwd_sig_dc
 Wire Wire Line
@@ -1856,4 +1739,105 @@ Wire Wire Line
 Wire Wire Line
 	8000 2600 8000 2700
 Connection ~ 8000 2600
+$Comp
+L Device:D_Schottky_Small_ALT D?
+U 1 1 5FE8910D
+P 10150 2450
+F 0 "D?" H 10200 2400 50  0000 L CNN
+F 1 "1N5711" H 10000 2550 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 10150 2450 50  0001 C CNN
+F 3 "" V 10150 2450 50  0001 C CNN
+	1    10150 2450
+	0    -1   1    0   
+$EndComp
+Wire Wire Line
+	10550 2600 10150 2600
+Wire Wire Line
+	10150 2600 10150 2550
+Connection ~ 10550 2600
+Wire Wire Line
+	10150 2350 10150 2300
+Wire Wire Line
+	10000 2300 10150 2300
+Connection ~ 10150 2300
+Wire Wire Line
+	9800 2300 9700 2300
+$Comp
+L Device:D_Schottky_Small_ALT D?
+U 1 1 5FF659C1
+P 10350 3200
+F 0 "D?" H 10300 3100 50  0000 L CNN
+F 1 "1N5711" H 10200 3300 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 10350 3200 50  0001 C CNN
+F 3 "" V 10350 3200 50  0001 C CNN
+	1    10350 3200
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5FF659C7
+P 10600 3400
+F 0 "C?" H 10700 3400 50  0000 L CNN
+F 1 "100nF" H 10300 3400 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
+Wire Wire Line
+	10600 3500 10600 3550
+Wire Wire Line
+	10450 3200 10600 3200
+Wire Wire Line
+	10600 3300 10600 3200
+Connection ~ 10600 3200
+Wire Wire Line
+	10600 3200 10700 3200
+$Comp
+L power:GNDA #PWR?
+U 1 1 5FF659D2
+P 10600 3550
+F 0 "#PWR?" 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 Device:R_Small R?
+U 1 1 5FF659D8
+P 9950 3200
+F 0 "R?" V 9754 3200 50  0000 C CNN
+F 1 "100kΩ" V 9845 3200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9950 3200 50  0001 C CNN
+F 3 "~" H 9950 3200 50  0001 C CNN
+	1    9950 3200
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	10250 3200 10200 3200
+$Comp
+L Device:D_Schottky_Small_ALT D?
+U 1 1 5FF659DF
+P 10200 3350
+F 0 "D?" H 10250 3300 50  0000 L CNN
+F 1 "1N5711" H 10050 3450 50  0000 L CNN
+F 2 "Diode_SMD:D_SMA" V 10200 3350 50  0001 C CNN
+F 3 "" V 10200 3350 50  0001 C CNN
+	1    10200 3350
+	0    -1   1    0   
+$EndComp
+Wire Wire Line
+	10600 3500 10200 3500
+Wire Wire Line
+	10200 3500 10200 3450
+Connection ~ 10600 3500
+Wire Wire Line
+	10200 3250 10200 3200
+Wire Wire Line
+	10050 3200 10200 3200
+Connection ~ 10200 3200
+Wire Wire Line
+	9850 3200 9750 3200
 $EndSCHEMATC