diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 197129c..c0555c3 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/cp.ext b/mag/cp.ext
index 648a010..84fd6ee 100644
--- a/mag/cp.ext
+++ b/mag/cp.ext
@@ -19,8 +19,14 @@
 node "a_10_n50#" 3989 2430.18 10 -50 p 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2779200 17200 0 0 1936200 15780 239200 4200 0 0 0 0 0 0 0 0 0 0
 node "vdd!" 16208 127784 -490 -160 nw 0 0 0 0 40009000 27420 0 0 78300 1120 6840000 39800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 745200 5020 0 0 6275100 44200 960700 13000 348300 5280 348300 5280 3226600 19660 0 0 0 0
 substrate "gnd!" 0 0 -370 -2840 ndif 0 0 0 0 0 0 0 0 3419400 21800 81200 1140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1389600 8600 0 0 3576600 28780 732600 8960 351000 5300 351000 5300 4550400 19920 0 0 0 0
-cap "out" "a_1710_0#" 841.733
+cap "vdd!" "out" 281.2
+cap "vdd!" "a_1710_n2840#" 254.08
+cap "vdd!" "a_10_n50#" 530.297
+cap "a_1710_0#" "down" 320.4
+cap "upbar" "down" 20.625
+cap "vdd!" "a_3060_n2840#" 320.4
 cap "a_10_n50#" "vbias" 192.9
+cap "out" "a_1710_0#" 841.733
 cap "a_1710_n2840#" "a_1710_0#" 828.847
 cap "vdd!" "a_7110_0#" 42.55
 cap "a_10_n50#" "a_1710_0#" 41.6842
@@ -28,12 +34,6 @@
 cap "a_1710_n2840#" "upbar" 291.6
 cap "vdd!" "a_1710_0#" 707.2
 cap "a_1710_n2840#" "out" 606.81
-cap "vdd!" "out" 281.2
-cap "a_1710_0#" "down" 320.4
-cap "upbar" "down" 20.625
-cap "vdd!" "a_1710_n2840#" 254.08
-cap "vdd!" "a_10_n50#" 530.297
-cap "vdd!" "a_3060_n2840#" 320.4
 device msubckt sky130_fd_pr__nfet_01v8 8100 -2840 8101 -2839 l=360 w=1800 "gnd!" "a_1710_0#" 720 0 "a_7110_n2840#" 1800 0 "out" 1800 0
 device msubckt sky130_fd_pr__nfet_01v8 6750 -2840 6751 -2839 l=360 w=1800 "gnd!" "down" 720 0 "gnd!" 1800 0 "a_7110_n2840#" 1800 0
 device msubckt sky130_fd_pr__nfet_01v8 5400 -2840 5401 -2839 l=360 w=1800 "gnd!" "out" 720 0 "a_3060_n2840#" 1800 0 "gnd!" 1800 0
diff --git a/mag/user_analog_project_wrapper.ext b/mag/user_analog_project_wrapper.ext
index d6a0308..6713652 100644
--- a/mag/user_analog_project_wrapper.ext
+++ b/mag/user_analog_project_wrapper.ext
@@ -1,4 +1,4 @@
-timestamp 1640895704
+timestamp 1640897998
 version 8.3
 tech sky130A
 style ngspice()
@@ -873,7 +873,7 @@
 node "vccd2" 0 6519 0 643842 m3 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 11808000 14520 0 0 0 0 0 0
 node "io_analog[0]" 0 6825 582300 677984 m3 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 12500000 15000 0 0 0 0 0 0
 node "io_analog[10]" 0 6825 0 680242 m3 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 12500000 15000 0 0 0 0 0 0
-node "m3_18822_686352#" 1 1492.23 18822 686352 m3 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 1558800 4998 112896 2544 0 0 0 0
+node "m3_18822_686352#" 0 1408.3 18822 686352 m3 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 1428000 4780 0 0 0 0 0 0
 node "io_analog[1]" 0 6825 566594 702300 m3 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 12500000 15000 0 0 0 0 0 0
 node "vssa1" 0 6519 520594 702340 m3 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 11808000 14520 0 0 0 0 0 0
 node "vssa1" 0 6519 510594 702340 m3 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 11808000 14520 0 0 0 0 0 0
@@ -1389,13 +1389,6 @@
 node "wb_rst_i" 1 631.648 1706 -800 m2 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 143360 2784 0 0 0 0 0 0 0 0
 node "wb_clk_i" 1 631.648 524 -800 m2 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 143360 2784 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 "io_clamp_high[0]" "io_analog[4]" 525
-cap "io_clamp_low[0]" "io_clamp_high[0]" 525
-cap "io_analog[4]" "io_clamp_low[0]" 525
-cap "io_clamp_high[1]" "io_analog[5]" 525
-cap "io_clamp_low[1]" "io_clamp_high[1]" 525
-cap "m3_18822_686352#" "c1_18922_686452#" 3542.05
-cap "io_analog[4]" "io_analog[4]" 26250
 cap "io_analog[5]" "io_clamp_low[1]" 525
 cap "io_analog[4]" "io_analog[4]" 26250
 cap "io_analog[4]" "io_analog[4]" 21250
@@ -1411,5 +1404,12 @@
 cap "io_analog[6]" "io_analog[6]" 21250
 cap "io_analog[6]" "io_analog[6]" 21250
 cap "io_analog[6]" "io_analog[6]" 26250
+cap "io_clamp_high[0]" "io_analog[4]" 525
+cap "io_clamp_low[0]" "io_clamp_high[0]" 525
+cap "io_analog[4]" "io_clamp_low[0]" 525
+cap "io_clamp_high[1]" "io_analog[5]" 525
+cap "io_clamp_low[1]" "io_clamp_high[1]" 525
+cap "m3_18822_686352#" "c1_18922_686452#" 3094.42
+cap "io_analog[4]" "io_analog[4]" 26250
 device csubckt sky130_fd_pr__cap_mim_m3_1 18922 686452 18923 686453 w=1000 l=1000 "None" "c1_18922_686452#" 3680 0 "m3_18822_686352#" 3600 0
 merge "cp_0/gnd!" "VSUBS" 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 0
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index f3005ed..f41d909 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1640895704
+timestamp 1640897998
 << metal2 >>
 rect 524 -800 636 480
 rect 1706 -800 1818 480
@@ -518,10 +518,7 @@
 rect 510594 702340 515394 704800
 rect 520594 702340 525394 704800
 rect 566594 702300 571594 704800
-rect 18822 687524 20121 687552
-rect 18822 686380 20037 687524
-rect 20101 686380 20121 687524
-rect 18822 686352 20121 686380
+rect 18822 686352 20012 687552
 rect -800 680242 1700 685242
 rect 582300 677984 584800 682984
 rect -800 643842 1660 648642
@@ -686,8 +683,6 @@
 rect 583520 2726 584800 2838
 rect -800 1544 480 1656
 rect 583520 1544 584800 1656
-<< via3 >>
-rect 20037 686380 20101 687524
 << mimcap >>
 rect 18922 687412 19922 687452
 rect 18922 686492 18962 687412
@@ -702,14 +697,10 @@
 rect 227594 702300 232594 704800
 rect 318994 702300 323994 704800
 rect 329294 702300 334294 704800
-rect 20021 687524 20117 687540
 rect 18961 687412 19883 687413
 rect 18961 686492 18962 687412
 rect 19882 686492 19883 687412
 rect 18961 686491 19883 686492
-rect 20021 686380 20037 687524
-rect 20101 686380 20117 687524
-rect 20021 686364 20117 686380
 << metal5 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800