diff --git a/mag/1T1R_2x2.mag b/mag/1T1R_2x2.mag
index 7d32c59..5e9f319 100644
--- a/mag/1T1R_2x2.mag
+++ b/mag/1T1R_2x2.mag
@@ -1,9 +1,9 @@
 magic
 tech sky130B
-timestamp 1645671873
+timestamp 1647526152
 use 1T1R  1T1R_0
 array 0 1 216 0 1 200
-timestamp 1645671787
+timestamp 1646863508
 transform 1 0 130 0 1 81
 box -130 -81 86 119
 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 920ba4a..30db61f 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,19 +1,83 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1647480005
+timestamp 1647528591
 << dnwell >>
 rect 561940 685328 563006 686342
+<< nwell >>
+rect 208506 659508 209222 659758
+rect 215856 659510 216566 659754
 << pwell >>
 rect 562058 685450 562858 686250
+rect 208500 659122 209492 659384
+rect 215704 659220 216660 659394
+<< psubdiff >>
+rect 208654 659300 208968 659328
+rect 208654 659246 208716 659300
+rect 208924 659246 208968 659300
+rect 216000 659308 216370 659340
+rect 216000 659270 216054 659308
+rect 216342 659270 216370 659308
+rect 208654 659218 208968 659246
+rect 216000 659254 216370 659270
+<< nsubdiff >>
+rect 208646 659672 208942 659704
+rect 208646 659582 208712 659672
+rect 208888 659582 208942 659672
+rect 216054 659650 216382 659668
+rect 216054 659610 216094 659650
+rect 216342 659610 216382 659650
+rect 208646 659544 208942 659582
+rect 216054 659580 216382 659610
+<< psubdiffcont >>
+rect 208716 659246 208924 659300
+rect 216054 659270 216342 659308
+<< nsubdiffcont >>
+rect 208712 659582 208888 659672
+rect 216094 659610 216342 659650
 << poly >>
 rect 213898 659600 213984 659910
 rect 213882 658944 213998 659266
 << locali >>
+rect 215814 659766 216194 659768
+rect 208664 659732 209110 659733
+rect 208664 659699 209136 659732
+rect 215814 659700 216590 659766
+rect 216052 659699 216590 659700
+rect 208664 659674 208942 659699
+rect 208664 659582 208712 659674
+rect 208890 659582 208942 659674
+rect 216052 659650 216382 659699
+rect 208664 659548 208942 659582
+rect 208648 659300 208970 659328
+rect 208648 659246 208716 659300
+rect 208924 659246 208970 659300
 rect 215760 659268 215804 659620
+rect 216052 659610 216094 659650
+rect 216342 659610 216382 659650
+rect 216052 659580 216382 659610
+rect 215996 659310 216370 659340
 rect 217226 659318 217280 659384
+rect 215996 659268 216054 659310
+rect 216344 659268 216370 659310
+rect 208648 659190 208970 659246
+rect 215996 659207 216370 659268
+rect 215996 659206 216670 659207
+rect 208648 659155 209162 659190
+rect 215789 659156 216670 659206
+rect 215789 659154 216093 659156
+rect 216366 659155 216670 659156
 << viali >>
 rect 213906 659826 213974 659878
+rect 208712 659672 208890 659674
+rect 208712 659582 208888 659672
+rect 208888 659582 208890 659672
+rect 208716 659246 208924 659300
+rect 216094 659610 216342 659650
+rect 216054 659308 216344 659310
+rect 216054 659270 216342 659308
+rect 216342 659270 216344 659308
+rect 216054 659268 216344 659270
 rect 213902 658982 213982 659056
 << metal1 >>
 rect 561180 686400 561428 686442
@@ -58,10 +122,29 @@
 rect 213894 659826 213906 659878
 rect 213974 659826 213986 659878
 rect 213894 659820 213986 659826
+rect 208504 659764 208944 659766
 rect 216128 659764 216312 662068
+rect 208504 659674 209304 659764
 rect 215822 659762 216662 659764
+rect 208504 659582 208712 659674
+rect 208890 659666 209304 659674
 rect 215798 659668 216662 659762
+rect 208890 659582 208944 659666
+rect 216050 659650 216382 659668
+rect 208504 659546 208944 659582
+rect 208648 659300 208970 659328
+rect 208648 659246 208716 659300
+rect 208924 659246 208970 659300
 rect 215754 659264 215806 659622
+rect 216050 659610 216094 659650
+rect 216342 659610 216382 659650
+rect 216050 659578 216382 659610
+rect 215990 659310 216370 659340
+rect 215990 659268 216054 659310
+rect 216344 659268 216370 659310
+rect 208648 659220 208970 659246
+rect 215990 659220 216370 659268
+rect 208502 659124 209220 659220
 rect 215808 659124 216648 659220
 rect 213890 659056 213994 659062
 rect 213890 658982 213902 659056
@@ -1033,7 +1116,7 @@
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
 use 1T1R_2x2  1T1R_2x2_0
-timestamp 1645671873
+timestamp 1647526152
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
 use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_1