new
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index c0555c3..ff39012 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 84fd6ee..6df9dd2 100644
--- a/mag/cp.ext
+++ b/mag/cp.ext
@@ -19,21 +19,21 @@
 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 "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
-cap "vdd!" "a_3060_0#" 1788.27
 cap "a_1710_n2840#" "upbar" 291.6
-cap "vdd!" "a_1710_0#" 707.2
 cap "a_1710_n2840#" "out" 606.81
+cap "vdd!" "a_3060_n2840#" 320.4
+cap "vdd!" "a_7110_0#" 42.55
+cap "vdd!" "a_3060_0#" 1788.27
+cap "a_1710_0#" "down" 320.4
+cap "vdd!" "a_1710_0#" 707.2
+cap "upbar" "down" 20.625
+cap "vdd!" "out" 281.2
+cap "out" "a_1710_0#" 841.733
 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 6713652..a2fb834 100644
--- a/mag/user_analog_project_wrapper.ext
+++ b/mag/user_analog_project_wrapper.ext
@@ -1,11 +1,11 @@
-timestamp 1640897998
+timestamp 1640898484
 version 8.3
 tech sky130A
 style ngspice()
 scale 1000 1 500000
 resistclasses 4400000 2200000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
 use cp cp_0 1 0 66630 0 1 683860
-parameters sky130_fd_pr__cap_mim_m3_1 w=w l=l
+parameters sky130_fd_pr__cap_var_lvt l=l w=w a1=as a2=ad p1=ps p2=pd
 port "io_analog[4]" 41 329294 702300 334294 704800 m5
 port "io_analog[4]" 47 318994 702300 323994 704800 m5
 port "io_analog[5]" 42 227594 702300 232594 704800 m5
@@ -708,7 +708,6 @@
 node "io_analog[5]" 0 2775 217294 702300 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
 node "io_analog[6]" 0 2775 175894 702300 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
 node "io_analog[6]" 0 2775 165594 702300 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
-node "c1_18922_686452#" 0 0 18922 686452 mim 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 850084 3688 0 0 0 0
 node "io_in_3v3[0]" 1 613.728 583520 1544 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 143360 2784 0 0 0 0 0 0
 node "io_oeb[26]" 1 613.728 -800 1544 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 143360 2784 0 0 0 0 0 0
 node "io_in[0]" 1 613.728 583520 2726 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 143360 2784 0 0 0 0 0 0
@@ -873,7 +872,6 @@
 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#" 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
@@ -1388,28 +1386,30 @@
 node "wbs_ack_o" 1 631.648 2888 -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_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
+node "a_19580_685966#" 434 218.166 19580 685966 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 13284 760 0 0 4900 280 4900 280 0 0 0 0 0 0 0 0 0 0
+node "w_19462_685682#" 2982 291.938 19462 685682 nw 0 0 0 0 106606 1310 0 0 38800 1188 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12512 872 16192 888 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 "io_analog[5]" "io_clamp_low[1]" 525
-cap "io_analog[4]" "io_analog[4]" 26250
 cap "io_analog[4]" "io_analog[4]" 21250
-cap "io_clamp_high[2]" "io_analog[6]" 525
-cap "io_analog[5]" "io_analog[5]" 26250
-cap "io_analog[4]" "io_analog[4]" 21250
-cap "io_clamp_low[2]" "io_clamp_high[2]" 525
-cap "io_analog[5]" "io_analog[5]" 21250
 cap "io_analog[6]" "io_clamp_low[2]" 525
+cap "w_19462_685682#" "a_19580_685966#" 0.42365
+cap "io_analog[4]" "io_analog[4]" 21250
 cap "io_analog[5]" "io_analog[5]" 26250
 cap "io_analog[5]" "io_analog[5]" 21250
 cap "io_analog[6]" "io_analog[6]" 26250
-cap "io_analog[6]" "io_analog[6]" 21250
+cap "io_analog[5]" "io_analog[5]" 21250
 cap "io_analog[6]" "io_analog[6]" 21250
 cap "io_analog[6]" "io_analog[6]" 26250
+cap "io_analog[6]" "io_analog[6]" 21250
 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[5]" "io_clamp_low[1]" 525
 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
+cap "io_clamp_high[2]" "io_analog[6]" 525
+cap "io_analog[4]" "io_analog[4]" 26250
+cap "io_clamp_low[2]" "io_clamp_high[2]" 525
+cap "io_analog[5]" "io_analog[5]" 26250
+device subckt sky130_fd_pr__cap_var_lvt 19595 685744 19596 685745 l=36 w=200 "w_19462_685682#" "a_19580_685966#" 72 0 "w_19462_685682#" 400 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 f41d909..b4f9548 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,58 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1640897998
+timestamp 1640898484
+<< nwell >>
+rect 19462 685682 19764 686035
+<< varactor >>
+rect 19595 685744 19631 685944
+<< nsubdiff >>
+rect 19498 685920 19595 685944
+rect 19498 685768 19510 685920
+rect 19544 685768 19595 685920
+rect 19498 685744 19595 685768
+rect 19631 685920 19728 685944
+rect 19631 685768 19682 685920
+rect 19716 685768 19728 685920
+rect 19631 685744 19728 685768
+<< nsubdiffcont >>
+rect 19510 685768 19544 685920
+rect 19682 685768 19716 685920
+<< poly >>
+rect 19580 686016 19646 686032
+rect 19580 685982 19596 686016
+rect 19630 685982 19646 686016
+rect 19580 685966 19646 685982
+rect 19595 685944 19631 685966
+rect 19595 685718 19631 685744
+<< polycont >>
+rect 19596 685982 19630 686016
+<< locali >>
+rect 19580 686016 19650 686040
+rect 19580 685982 19596 686016
+rect 19630 685982 19650 686016
+rect 19580 685970 19650 685982
+rect 19510 685920 19544 685936
+rect 19510 685752 19544 685768
+rect 19682 685920 19716 685936
+rect 19682 685752 19716 685768
+<< viali >>
+rect 19596 685982 19630 686016
+rect 19510 685768 19544 685920
+rect 19682 685768 19716 685920
+<< metal1 >>
+rect 19580 686016 19650 686040
+rect 19580 685982 19596 686016
+rect 19630 685982 19650 686016
+rect 19580 685970 19650 685982
+rect 19504 685920 19550 685932
+rect 19504 685768 19510 685920
+rect 19544 685768 19550 685920
+rect 19504 685756 19550 685768
+rect 19676 685920 19722 685932
+rect 19676 685768 19682 685920
+rect 19716 685768 19722 685920
+rect 19676 685756 19722 685768
 << metal2 >>
 rect 524 -800 636 480
 rect 1706 -800 1818 480
@@ -518,7 +569,6 @@
 rect 510594 702340 515394 704800
 rect 520594 702340 525394 704800
 rect 566594 702300 571594 704800
-rect 18822 686352 20012 687552
 rect -800 680242 1700 685242
 rect 582300 677984 584800 682984
 rect -800 643842 1660 648642
@@ -683,13 +733,6 @@
 rect 583520 2726 584800 2838
 rect -800 1544 480 1656
 rect 583520 1544 584800 1656
-<< mimcap >>
-rect 18922 687412 19922 687452
-rect 18922 686492 18962 687412
-rect 19882 686492 19922 687412
-rect 18922 686452 19922 686492
-<< mimcapcontact >>
-rect 18962 686492 19882 687412
 << metal4 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800
@@ -697,10 +740,6 @@
 rect 227594 702300 232594 704800
 rect 318994 702300 323994 704800
 rect 329294 702300 334294 704800
-rect 18961 687412 19883 687413
-rect 18961 686492 18962 687412
-rect 19882 686492 19883 687412
-rect 18961 686491 19883 686492
 << metal5 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800