ro
diff --git a/mag/cbank.ext b/mag/cbank.ext
index f640bb9..ed9e328 100644
--- a/mag/cbank.ext
+++ b/mag/cbank.ext
@@ -1,4 +1,4 @@
-timestamp 1640983325
+timestamp 1640991424
 version 8.3
 tech sky130A
 style ngspice()
@@ -26,18 +26,18 @@
 node "a_2730_n30#" 133 1402.86 2730 -30 ndif 0 0 0 0 0 0 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 19600 560 19600 560 19600 560 642800 4060 0 0 0 0 0 0
 node "a_1720_n30#" 120 0 1720 -30 ndif 0 0 0 0 0 0 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "gnd!" 0 0 950 -1660 ppd 0 0 0 0 0 0 0 0 0 0 135200 2080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 512800 9000 433800 7420 496800 8120 1964400 12740 2795480 19244 0 0 0 0
+cap "a_3680_n30#" "v" 1301.39
+cap "a_2730_n30#" "v" 1301.39
+cap "a_3680_n30#" "a_4660_n30#" 199.5
+cap "v" "li_1720_n30#" 1301.39
 cap "a_6660_n30#" "v" 1301.39
 cap "a_5640_n30#" "v" 1301.39
 cap "a_5640_n30#" "a_6660_n30#" 191.52
 cap "a_4660_n30#" "v" 1301.39
-cap "a_3680_n30#" "v" 1301.39
 cap "a_4660_n30#" "a_5640_n30#" 199.5
-cap "a_2730_n30#" "v" 1301.39
-cap "a_3680_n30#" "a_4660_n30#" 199.5
-cap "a_2730_n30#" "a_3680_n30#" 199.5
-cap "v" "li_1720_n30#" 1301.39
-cap "a_2730_n30#" "li_1720_n30#" 199.5
 cap "a_1720_n30#" "li_1720_n30#" 18.13
+cap "a_2730_n30#" "a_3680_n30#" 199.5
+cap "a_2730_n30#" "li_1720_n30#" 199.5
 device csubckt sky130_fd_pr__cap_mim_m3_1 6510 590 6511 591 w=560 l=560 "None" "v" 1920 0 "a_6660_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 5510 590 5511 591 w=560 l=560 "None" "v" 1920 0 "a_5640_n30#" 1440 0
 device csubckt sky130_fd_pr__cap_mim_m3_1 4520 590 4521 591 w=560 l=560 "None" "v" 1920 0 "a_4660_n30#" 1440 0
@@ -49,16 +49,16 @@
 cap "switch_1/vcont" "switch_1/vin" -136.5
 cap "switch_0/vcont" "switch_0/vout" 4.23077
 cap "switch_0/vcont" "switch_0/vin" 83.635
-cap "switch_2/vout" "switch_2/vcont" 4.23077
-cap "switch_2/vin" "switch_2/vcont" 83.635
-cap "switch_1/vout" "switch_1/vcont" 4.23077
-cap "switch_1/vin" "switch_1/vcont" 83.635
+cap "switch_2/vcont" "switch_2/vout" 4.23077
+cap "switch_2/vcont" "switch_2/vin" 83.635
+cap "switch_1/vcont" "switch_1/vout" 4.23077
+cap "switch_1/vcont" "switch_1/vin" 83.635
 cap "switch_3/vcont" "switch_3/vout" 4.23077
 cap "switch_3/vcont" "switch_3/vin" 83.635
-cap "switch_4/vcont" "switch_4/vin" 83.635
 cap "switch_5/vcont" "switch_5/vout" 4.23077
 cap "switch_5/vcont" "switch_5/vin" 83.635
 cap "switch_4/vcont" "switch_4/vout" 4.23077
+cap "switch_4/vcont" "switch_4/vin" 83.635
 merge "switch_5/VSUBS" "switch_5/vout" -332.789 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -280 -1316 0 0 0 0 0 0 -21300 -442 0 0 0 0
 merge "switch_5/vout" "switch_4/VSUBS"
 merge "switch_4/VSUBS" "switch_4/vout"
diff --git a/mag/ro_complete.ext b/mag/ro_complete.ext
index 5cd8702..a046ad7 100644
--- a/mag/ro_complete.ext
+++ b/mag/ro_complete.ext
@@ -1,4 +1,4 @@
-timestamp 1640983325
+timestamp 1640991424
 version 8.3
 tech sky130A
 style ngspice()
@@ -16,10 +16,10 @@
 node "a0" 1408 5005.68 1916 -8790 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 565600 16300 0 0 0 0 0 0 0 0 0 0 0 0
 node "li_4080_1390#" 94 5201.91 4080 1390 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40000 1240 19600 560 19600 560 1919760 19328 57600 960 0 0 0 0
 node "li_1010_1400#" 88 1456.19 1010 1400 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38800 1200 19600 560 19600 560 19600 560 196600 4100 0 0 0 0
-node "li_7140_1400#" 85 6989.63 7140 1400 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50400 1320 32400 720 2607360 22208 57600 960 57600 960 0 0 0 0
-substrate "a_7790_n10640#" 0 0 7790 -10640 ppd 0 0 0 0 0 0 0 0 0 0 1216800 18720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1036800 17280 1349800 21100 1085200 18160 1085200 18160 3951000 27540 0 0 0 0
-cap "li_4080_1390#" "a5" 77.72
+node "li_7140_1400#" 85 7250.05 7140 1400 li 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50400 1320 32400 720 2607360 22208 57600 960 57600 960 0 0 0 0
+substrate "a_7790_n10640#" 0 0 7790 -10640 ppd 0 0 0 0 0 0 0 0 0 0 1216800 18720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1096400 18460 1326400 20840 1085200 18160 1085200 18160 4224000 28760 0 0 0 0
 cap "li_7140_1400#" "a5" 100.96
+cap "li_4080_1390#" "a5" 77.72
 cap "cbank_2/a0" "cbank_2/switch_0/vout" 46.5385
 cap "cbank_2/a2" "cbank_2/switch_2/vout" 46.5385
 cap "cbank_2/a1" "cbank_2/switch_1/vout" 46.5385
@@ -27,34 +27,32 @@
 cap "cbank_2/a5" "cbank_2/switch_5/vout" 12.6923
 cap "cbank_2/a4" "cbank_2/switch_4/vout" 46.5385
 cap "cbank_2/switch_5/vin" "li_7140_1400#" 24
-cap "cbank_2/a5" "cbank_2/switch_5/vout" 33.8462
+cap "cbank_2/switch_5/vout" "cbank_2/a5" 33.8462
 cap "cbank_1/gnd!" "cbank_2/v" 86.7059
-cap "a0" "cbank_2/v" 53.41
-cap "cbank_1/gnd!" "cbank_2/v" 275.882
 cap "cbank_1/switch_1/vin" "a0" 21.8167
 cap "cbank_1/gnd!" "a0" 181.38
+cap "a0" "cbank_2/v" 53.41
+cap "cbank_1/gnd!" "cbank_2/v" 275.882
 cap "a1" "cbank_2/v" 53.41
 cap "cbank_1/switch_1/vout" "cbank_2/v" 275.882
 cap "cbank_1/switch_1/vout" "a2" 60.0024
 cap "cbank_1/switch_2/vin" "a1" 23.6566
 cap "cbank_1/switch_1/vout" "a1" 209.96
-cap "a3" "cbank_2/v" 53.41
-cap "a2" "cbank_2/v" 53.41
+cap "cbank_2/v" "a3" 53.41
+cap "cbank_2/v" "a2" 53.41
+cap "cbank_2/v" "cbank_1/gnd!" 275.882
 cap "cbank_1/switch_4/vin" "a3" 11.4157
-cap "cbank_1/gnd!" "cbank_2/v" 275.882
+cap "cbank_1/switch_3/vin" "a2" 23.515
 cap "cbank_1/gnd!" "a3" 192.323
-cap "a2" "cbank_1/switch_3/vin" 23.515
 cap "cbank_1/gnd!" "a2" 124.302
+cap "cbank_1/switch_4/vin" "a3" 11.4157
 cap "a4" "li_7140_1400#" 53.41
 cap "cbank_1/switch_4/vout" "li_7140_1400#" 275.882
 cap "cbank_1/switch_5/vin" "a4" 20.5602
 cap "cbank_1/switch_4/vout" "a4" 190.632
-cap "cbank_1/switch_4/vin" "a3" 11.4157
 cap "li_7140_1400#" "cbank_2/a_6660_n30#" 126
-cap "cbank_1/switch_5/vout" "a_7790_n10640#" 162.097
-cap "cbank_1/switch_5/vout" "li_7140_1400#" 233.936
+cap "cbank_1/switch_5/vout" "li_7140_1400#" 91.6761
 cap "cbank_1/switch_5/vout" "a5" 124.931
-cap "cbank_1/gnd!" "a_7790_n10640#" 45.6818
 cap "cbank_1/a0" "cbank_1/switch_1/vin" 106.517
 cap "cbank_1/a0" "cbank_1/switch_0/vout" 248.36
 cap "cbank_1/a2" "cbank_1/switch_1/vout" 149.619
@@ -70,41 +68,39 @@
 cap "cbank_1/a4" "cbank_1/switch_4/vout" 261.965
 cap "cbank_1/a5" "cbank_1/switch_5/vout" 143.406
 cap "cbank_0/gnd!" "cbank_1/v" 47.5484
-cap "cbank_0/gnd!" "cbank_1/v" 151.29
 cap "cbank_1/a0" "cbank_1/v" 53.41
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
 cap "cbank_1/a1" "cbank_1/v" 53.41
-cap "cbank_1/a3" "cbank_1/v" 53.41
-cap "cbank_1/a2" "cbank_1/v" 53.41
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
-cap "cbank_1/a4" "li_4080_1390#" 53.41
+cap "cbank_1/v" "cbank_1/a3" 53.41
+cap "cbank_1/v" "cbank_1/a2" 53.41
+cap "cbank_1/v" "cbank_0/gnd!" 151.29
+cap "li_4080_1390#" "cbank_1/a4" 53.41
 cap "cbank_0/gnd!" "li_4080_1390#" 151.29
 cap "cbank_0/gnd!" "li_4080_1390#" 41.6979
 cap "cbank_1/switch_5/vin" "li_4080_1390#" 133.875
 cap "cbank_0/gnd!" "cbank_1/v" 47.5484
-cap "cbank_0/switch_1/vin" "a0" 82.3167
 cap "cbank_0/gnd!" "cbank_1/v" 151.29
 cap "cbank_0/gnd!" "a0" 296.011
-cap "cbank_0/switch_1/vout" "cbank_1/v" 151.29
-cap "cbank_0/switch_1/vout" "a2" 118.551
-cap "cbank_0/switch_2/vin" "a1" 89.259
-cap "cbank_0/switch_1/vout" "a1" 347.808
+cap "cbank_0/switch_1/vin" "a0" 82.3167
+cap "cbank_1/v" "cbank_0/switch_1/vout" 151.29
+cap "a2" "cbank_0/switch_1/vout" 118.551
+cap "a1" "cbank_0/switch_2/vin" 89.259
+cap "a1" "cbank_0/switch_1/vout" 347.808
+cap "cbank_0/gnd!" "cbank_1/v" 151.29
+cap "cbank_0/gnd!" "a3" 316.073
+cap "cbank_0/gnd!" "a2" 182.851
 cap "cbank_0/switch_4/vin" "a3" 43.0727
 cap "cbank_0/switch_3/vin" "a2" 88.7246
-cap "cbank_1/v" "cbank_0/gnd!" 151.29
-cap "a3" "cbank_0/gnd!" 316.073
-cap "a2" "cbank_0/gnd!" 182.851
-cap "cbank_0/switch_5/vin" "a4" 77.5759
-cap "cbank_0/switch_4/vout" "li_4080_1390#" 151.29
-cap "cbank_0/switch_4/vout" "a4" 312.991
-cap "cbank_0/switch_4/vin" "a3" 43.0727
-cap "cbank_0/switch_5/vout" "a_7790_n10640#" 193.269
+cap "li_4080_1390#" "cbank_0/switch_4/vout" 151.29
+cap "a4" "cbank_0/switch_5/vin" 77.5759
+cap "a4" "cbank_0/switch_4/vout" 312.991
+cap "a3" "cbank_0/switch_4/vin" 43.0727
 cap "cbank_0/switch_5/vout" "li_4080_1390#" 438.698
-cap "cbank_0/switch_5/vout" "li_7140_1400#" 142.26
+cap "cbank_0/switch_5/vout" "li_7140_1400#" -2.84217e-14
 cap "cbank_0/switch_5/vout" "a5" 187.16
-cap "cbank_0/gnd!" "a_7790_n10640#" 45.6818
-cap "cbank_0/a0" "cbank_0/switch_1/vin" 46.0167
-cap "cbank_0/a0" "cbank_0/switch_0/vout" 133.728
+cap "cbank_0/switch_1/vin" "cbank_0/a0" 46.0167
+cap "cbank_0/switch_0/vout" "cbank_0/a0" 133.728
 cap "cbank_0/a1" "cbank_0/switch_2/vin" 49.8976
 cap "cbank_0/a1" "cbank_0/switch_1/vout" 151.387
 cap "cbank_0/a2" "cbank_0/switch_2/vout" 91.0707
@@ -112,16 +108,16 @@
 cap "cbank_0/a3" "cbank_0/switch_3/vout" 140.663
 cap "cbank_0/a2" "cbank_0/switch_3/vin" 49.5988
 cap "cbank_0/a2" "cbank_0/switch_2/vout" 44.5323
-cap "cbank_0/switch_4/vin" "a3" 24.0785
-cap "cbank_0/a5" "cbank_0/switch_5/vout" 12.6923
 cap "cbank_0/a4" "cbank_0/switch_5/vin" 43.3665
 cap "cbank_0/a4" "cbank_0/switch_4/vout" 139.606
+cap "cbank_0/switch_4/vin" "a3" 24.0785
+cap "cbank_0/a5" "cbank_0/switch_5/vout" 12.6923
 cap "cbank_0/a5" "cbank_0/switch_5/vout" 81.1776
 cap "ro_var_extend_0/gnd" "cbank_0/v" 151.9
 cap "ro_var_extend_0/gnd" "li_4080_1390#" 796.97
 cap "ro_var_extend_0/gnd" "li_4080_1390#" 769.58
-cap "ro_var_extend_0/w_n120_n750#" "li_4080_1390#" 415.935
-cap "ro_var_extend_0/w_n120_n750#" "li_7140_1400#" 294.59
+cap "li_4080_1390#" "ro_var_extend_0/gnd" 415.935
+cap "li_7140_1400#" "ro_var_extend_0/gnd" 294.59
 cap "ro_var_extend_0/gnd" "ro_var_extend_0/out1" 69.0462
 cap "ro_var_extend_0/out1" "ro_var_extend_0/out1" 120.023
 cap "ro_var_extend_0/out1" "ro_var_extend_0/out3" 116.667
@@ -131,9 +127,9 @@
 cap "ro_var_extend_0/out2" "ro_var_extend_0/out2" 113.031
 cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/out2" 184.5
 cap "ro_var_extend_0/gnd" "ro_var_extend_0/out2" 259.55
-cap "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/vcont" 214.76
-cap "ro_var_extend_0/gnd" "ro_var_extend_0/vcont" -11.167
-cap "ro_var_extend_0/gnd" "ro_var_extend_0/out3" 392.251
+cap "ro_var_extend_0/gnd" "ro_var_extend_0/out3" 215.6
+cap "ro_var_extend_0/gnd" "ro_var_extend_0/vcont" 3.86897
+cap "ro_var_extend_0/gnd" "ro_var_extend_0/out3" 475.062
 merge "cbank_0/a4" "cbank_1/a4" -1801.69 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -154480 -6032 0 0 0 0 0 0 0 0 0 0 0 0
 merge "cbank_1/a4" "cbank_2/a4"
 merge "cbank_2/a4" "a4"
@@ -142,13 +138,13 @@
 merge "cbank_0/a5" "cbank_1/a5" -1833.47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -192400 -6020 0 0 0 0 0 0 0 0 0 0 0 0
 merge "cbank_1/a5" "cbank_2/a5"
 merge "cbank_2/a5" "a5"
-merge "ro_var_extend_0/out3" "cbank_2/v" -4733.08 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14880 -132 0 0 -1007200 -18788 33000 -960 33000 -960 0 0 0 0
+merge "ro_var_extend_0/out3" "cbank_2/v" -4771.83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14880 -132 0 0 -1007200 -18788 33000 -960 33000 -960 0 0 0 0
 merge "cbank_2/v" "li_7140_1400#"
 merge "ro_var_extend_0/out2" "cbank_1/v" -3879.76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -480 -136 0 0 0 0 -616280 -17168 448800 -960 0 0 0 0
 merge "cbank_1/v" "li_4080_1390#"
-merge "ro_var_extend_0/w_n120_n750#" "ro_var_extend_0/gnd" -1380.6 0 0 0 0 0 0 0 0 0 0 337340 -2080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 314620 -1920 161380 -3848 142140 -2800 142140 -2800 -31640 -8574 0 0 0 0
-merge "ro_var_extend_0/gnd" "cbank_0/gnd!"
-merge "cbank_0/gnd!" "cbank_1/gnd!"
+merge "ro_var_extend_0/gnd" "cbank_0/gnd!" -1460.33 0 0 0 0 0 0 0 0 0 0 337340 -2080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 356620 -2208 477080 -3348 16100 -2800 16100 -2800 -399340 -9662 0 0 0 0
+merge "cbank_0/gnd!" "cbank_1/switch_5/vout"
+merge "cbank_1/switch_5/vout" "cbank_1/gnd!"
 merge "cbank_1/gnd!" "cbank_2/switch_5/vout"
 merge "cbank_2/switch_5/vout" "cbank_2/gnd!"
 merge "cbank_2/gnd!" "a_7790_n10640#"
diff --git a/mag/ro_complete.mag b/mag/ro_complete.mag
index a28fa21..5c95506 100644
--- a/mag/ro_complete.mag
+++ b/mag/ro_complete.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1640959700
+timestamp 1640991424
 << psubdiff >>
 rect 4315 75 4445 90
 rect 4315 -25 4330 75
@@ -112,6 +112,11 @@
 rect 3720 680 3730 700
 rect 3800 680 3810 750
 rect 3720 670 3810 680
+rect 3595 565 3735 635
+rect 3675 535 3735 565
+rect 3675 485 3680 535
+rect 3730 485 3735 535
+rect 3675 480 3735 485
 rect 4320 75 4440 85
 rect 4320 -25 4330 75
 rect 4430 -25 4440 75
@@ -218,6 +223,7 @@
 rect 675 690 725 740
 rect 2220 685 2270 735
 rect 3730 680 3800 750
+rect 3680 485 3730 535
 rect 4330 -25 4430 75
 rect 4330 -355 4430 -255
 rect 4330 -685 4430 -585
@@ -249,12 +255,15 @@
 rect 3720 680 3730 750
 rect 3800 680 3810 750
 rect 3720 670 3810 680
-rect 4325 430 4435 435
-rect 4325 425 4330 430
-rect 3590 335 4330 425
-rect 4325 330 4330 335
-rect 4430 330 4435 430
-rect 4325 325 4435 330
+rect 4325 560 4435 565
+rect 4325 555 4330 560
+rect 3655 535 4330 555
+rect 3655 485 3680 535
+rect 3730 485 4330 535
+rect 3655 465 4330 485
+rect 4325 460 4330 465
+rect 4430 460 4435 560
+rect 4325 455 4435 460
 rect 4320 75 4440 85
 rect 4320 -25 4330 75
 rect 4430 -25 4440 75
@@ -331,7 +340,7 @@
 rect 675 690 725 740
 rect 2220 685 2270 735
 rect 3730 680 3800 750
-rect 4330 330 4430 430
+rect 4330 460 4430 560
 rect 4330 -25 4430 75
 rect 4330 -355 4430 -255
 rect 4330 -685 4430 -585
@@ -364,10 +373,10 @@
 rect 3800 680 4120 750
 rect 3710 655 4120 680
 rect 4000 -3705 4120 655
-rect 4325 430 4435 435
-rect 4325 330 4330 430
-rect 4430 330 4435 430
-rect 4325 325 4435 330
+rect 4325 560 4435 565
+rect 4325 460 4330 560
+rect 4430 460 4435 560
+rect 4325 455 4435 460
 rect 4320 75 4440 85
 rect 4320 -25 4330 75
 rect 4430 -25 4440 75
@@ -447,7 +456,7 @@
 << via2 >>
 rect 675 690 725 740
 rect 2220 685 2270 735
-rect 4330 330 4430 430
+rect 4330 460 4430 560
 rect 4330 -25 4430 75
 rect 4330 -355 4430 -255
 rect 4330 -685 4430 -585
@@ -476,10 +485,10 @@
 rect 2195 685 2220 735
 rect 2270 685 2295 735
 rect 2195 210 2295 685
-rect 4325 430 4435 435
-rect 4325 330 4330 430
-rect 4430 330 4435 430
-rect 4325 325 4435 330
+rect 4325 560 4435 565
+rect 4325 460 4330 560
+rect 4430 460 4435 560
+rect 4325 455 4435 460
 rect 2195 110 3890 210
 rect 3790 -1920 3890 110
 rect 4320 75 4440 85
@@ -564,7 +573,7 @@
 rect 4320 -5315 4440 -5305
 << via3 >>
 rect 675 690 725 740
-rect 4330 330 4430 430
+rect 4330 460 4430 560
 rect 4330 -25 4430 75
 rect 4330 -355 4430 -255
 rect 4330 -685 4430 -585
@@ -591,10 +600,10 @@
 rect 725 690 735 740
 rect 665 680 735 690
 rect 675 -205 725 680
-rect 4305 430 4455 465
-rect 4305 330 4330 430
-rect 4430 330 4455 430
-rect 4305 75 4455 330
+rect 4305 560 4455 595
+rect 4305 460 4330 560
+rect 4430 460 4455 560
+rect 4305 75 4455 460
 rect 4305 -25 4330 75
 rect 4430 -25 4455 75
 rect 4305 -255 4455 -25
@@ -611,9 +620,9 @@
 rect 4430 -1345 4455 -1245
 rect 4305 -1575 4455 -1345
 rect 4305 -1625 4330 -1575
-rect 4085 -1675 4330 -1625
+rect 3965 -1675 4330 -1625
 rect 4430 -1675 4455 -1575
-rect 4085 -1775 4455 -1675
+rect 3965 -1775 4455 -1675
 rect 4305 -1905 4455 -1775
 rect 3453 -1930 3573 -1920
 rect 3453 -2030 3463 -1930
@@ -634,7 +643,7 @@
 rect 4305 -3325 4330 -3225
 rect 4430 -3325 4455 -3225
 rect 4305 -3395 4455 -3325
-rect 4095 -3545 4455 -3395
+rect 3950 -3545 4455 -3395
 rect 4305 -3555 4455 -3545
 rect 4305 -3655 4330 -3555
 rect 4430 -3655 4455 -3555
@@ -655,24 +664,21 @@
 rect 4305 -4975 4330 -4875
 rect 4430 -4975 4455 -4875
 rect 4305 -5180 4455 -4975
-rect 3885 -5205 4035 -5180
+rect 3885 -5205 4455 -5180
 rect 3885 -5305 3910 -5205
-rect 4010 -5305 4035 -5205
-rect 3885 -5330 4035 -5305
-rect 4095 -5205 4455 -5180
-rect 4095 -5305 4330 -5205
+rect 4010 -5305 4330 -5205
 rect 4430 -5305 4455 -5205
-rect 4095 -5330 4455 -5305
+rect 3885 -5330 4455 -5305
 use cbank  cbank_1
-timestamp 1640959700
+timestamp 1640991424
 transform 1 0 -42 0 1 -2705
 box -15 -840 4075 775
 use cbank  cbank_2
-timestamp 1640959700
+timestamp 1640991424
 transform 1 0 -42 0 1 -4490
 box -15 -840 4075 775
 use cbank  cbank_0
-timestamp 1640959700
+timestamp 1640991424
 transform 1 0 -42 0 1 -935
 box -15 -840 4075 775
 use ro_var_extend  ro_var_extend_0
@@ -686,4 +692,6 @@
 rlabel locali 3072 -825 3072 -825 1 a4
 rlabel locali 2591 -825 2591 -825 1 a3
 rlabel locali 2101 -835 2101 -835 1 a2
+rlabel space 3630 370 3630 370 1 vcont
+rlabel space 1275 1115 1275 1115 1 vdd!
 << end >>
diff --git a/mag/ro_var_extend.ext b/mag/ro_var_extend.ext
index 1d6e822..de1eaa2 100644
--- a/mag/ro_var_extend.ext
+++ b/mag/ro_var_extend.ext
@@ -14,16 +14,16 @@
 node "w_n120_n750#" 20671 4346.02 -120 -750 nw 0 0 0 0 363304 4204 0 0 116400 3564 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 37536 2616 1153264 13180 0 0 0 0 0 0 0 0 0 0
 node "vdd" 21463 18367.8 -250 320 nw 0 0 0 0 4464300 14320 0 0 105600 2580 120000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1276520 16068 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "gnd" 0 0 -710 -890 ppd 0 0 0 0 0 0 0 0 60000 1800 1604600 26100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7902720 57188 0 0 0 0 0 0 0 0 0 0 0 0
-cap "vdd" "out2" 235.622
-cap "vdd" "out1" 230.66
-cap "vdd" "out3" 230.554
 cap "out1" "out2" 40.8506
 cap "w_n120_n750#" "vcont" 140.194
 cap "out3" "out2" 1263.05
 cap "w_n120_n750#" "out2" 789.263
 cap "out3" "out1" 1156.32
 cap "w_n120_n750#" "out1" 569.035
+cap "vdd" "out2" 235.622
 cap "w_n120_n750#" "out3" 215.464
+cap "vdd" "out1" 230.66
+cap "vdd" "out3" 230.554
 device subckt sky130_fd_pr__cap_var_lvt 5955 -694 5956 -693 l=36 w=200 "w_n120_n750#" "out3" 72 0 "w_n120_n750#" 400 0
 device subckt sky130_fd_pr__cap_var_lvt 2991 -690 2992 -689 l=36 w=200 "w_n120_n750#" "out2" 72 0 "w_n120_n750#" 400 0
 device subckt sky130_fd_pr__cap_var_lvt 17 -688 18 -687 l=36 w=200 "w_n120_n750#" "out1" 72 0 "w_n120_n750#" 400 0
diff --git a/mag/switch.ext b/mag/switch.ext
index 4013755..6ebc6e0 100644
--- a/mag/switch.ext
+++ b/mag/switch.ext
@@ -9,7 +9,7 @@
 node "vin" 1082 0 -190 0 ndif 0 0 0 0 0 0 0 0 259200 3240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 196000 3080 0 0 0 0 0 0 0 0 0 0 0 0
 node "vcont" 1139 384.82 -40 1460 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124600 3560 0 0 19600 560 0 0 0 0 0 0 0 0 0 0 0 0
 substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "vout" "vin" 420
+cap "vin" "vout" 420
 cap "vout" "vcont" 16.5
-cap "vcont" "vin" 8.25
+cap "vin" "vcont" 8.25
 device msubckt sky130_fd_pr__nfet_01v8 -10 0 -9 1 l=70 w=1440 "VSUBS" "vcont" 140 0 "vin" 1440 0 "vout" 1440 0