diff --git a/caravel b/caravel
index 0f16ba8..860878e 160000
--- a/caravel
+++ b/caravel
@@ -1 +1 @@
-Subproject commit 0f16ba8eaae841a6f122fc0d5837005d3312fd2b
+Subproject commit 860878e32b033d76fda7cf6ea7212fa697ef6eee
diff --git a/mag/BUFFMIN_v1p1.mag b/mag/BUFFMIN_v1p1.mag
new file mode 100644
index 0000000..e617159
--- /dev/null
+++ b/mag/BUFFMIN_v1p1.mag
@@ -0,0 +1,27 @@
+magic
+tech sky130A
+timestamp 1640975112
+<< locali >>
+rect -15 20 10 45
+rect 430 20 455 45
+<< metal1 >>
+rect -15 220 15 310
+rect -15 65 15 155
+use invmin_magic_v1p1  invmin_magic_v1p1_0
+timestamp 1640975112
+transform 1 0 370 0 1 70
+box -150 -75 85 265
+use invmin_magic_v1p1  invmin_magic_v1p1_1
+timestamp 1640975112
+transform 1 0 135 0 1 70
+box -150 -75 85 265
+<< labels >>
+flabel locali s -2 34 -2 34 0 FreeSans 300 0 0 0 VIN
+port 1 nsew
+flabel locali s 435 31 435 31 0 FreeSans 300 0 0 0 VOUT
+port 2 nsew
+flabel metal1 s -3 266 -3 266 0 FreeSans 300 0 0 0 VDD
+port 3 nsew
+flabel metal1 s -7 108 -7 108 0 FreeSans 300 0 0 0 VSS
+port 4 nsew
+<< end >>
diff --git a/mag/CAPOSC_v1p1.mag b/mag/CAPOSC_v1p1.mag
new file mode 100644
index 0000000..4afa05e
--- /dev/null
+++ b/mag/CAPOSC_v1p1.mag
@@ -0,0 +1,480 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< metal2 >>
+rect 9938 4588 10022 4622
+rect 9938 4532 9952 4588
+rect 10008 4532 10022 4588
+rect 9938 4508 10022 4532
+rect 9938 4452 9952 4508
+rect 10008 4452 10022 4508
+rect 9938 4428 10022 4452
+rect 9938 4372 9952 4428
+rect 10008 4372 10022 4428
+rect 9938 4348 10022 4372
+rect 9938 4292 9952 4348
+rect 10008 4292 10022 4348
+rect 9938 4268 10022 4292
+rect 9938 4212 9952 4268
+rect 10008 4212 10022 4268
+rect 9938 4188 10022 4212
+rect 9938 4132 9952 4188
+rect 10008 4132 10022 4188
+rect 9938 4108 10022 4132
+rect 9938 4052 9952 4108
+rect 10008 4052 10022 4108
+rect 9938 4028 10022 4052
+rect 9938 3972 9952 4028
+rect 10008 3972 10022 4028
+rect 9938 3948 10022 3972
+rect 9938 3892 9952 3948
+rect 10008 3892 10022 3948
+rect 9938 3868 10022 3892
+rect 9938 3812 9952 3868
+rect 10008 3812 10022 3868
+rect 9938 3788 10022 3812
+rect 9938 3732 9952 3788
+rect 10008 3732 10022 3788
+rect 9938 3708 10022 3732
+rect 9938 3652 9952 3708
+rect 10008 3652 10022 3708
+rect 9938 3628 10022 3652
+rect 9938 3572 9952 3628
+rect 10008 3572 10022 3628
+rect 9938 3548 10022 3572
+rect 9938 3492 9952 3548
+rect 10008 3492 10022 3548
+rect 9938 3468 10022 3492
+rect 9938 3412 9952 3468
+rect 10008 3412 10022 3468
+rect 9938 3388 10022 3412
+rect 9938 3332 9952 3388
+rect 10008 3332 10022 3388
+rect 9938 3308 10022 3332
+rect 9938 3252 9952 3308
+rect 10008 3252 10022 3308
+rect 9938 3228 10022 3252
+rect 9938 3172 9952 3228
+rect 10008 3172 10022 3228
+rect 9938 3148 10022 3172
+rect 9938 3092 9952 3148
+rect 10008 3092 10022 3148
+rect 9938 3068 10022 3092
+rect 9938 3012 9952 3068
+rect 10008 3012 10022 3068
+rect 9938 2988 10022 3012
+rect 9938 2932 9952 2988
+rect 10008 2932 10022 2988
+rect 9938 2908 10022 2932
+rect 9938 2852 9952 2908
+rect 10008 2852 10022 2908
+rect 9938 2828 10022 2852
+rect 9938 2772 9952 2828
+rect 10008 2772 10022 2828
+rect 9938 2748 10022 2772
+rect 9938 2692 9952 2748
+rect 10008 2692 10022 2748
+rect 9938 2668 10022 2692
+rect 9938 2612 9952 2668
+rect 10008 2612 10022 2668
+rect 9938 2588 10022 2612
+rect 9938 2532 9952 2588
+rect 10008 2532 10022 2588
+rect 9938 2508 10022 2532
+rect 9938 2452 9952 2508
+rect 10008 2452 10022 2508
+rect 9938 2428 10022 2452
+rect 9938 2372 9952 2428
+rect 10008 2372 10022 2428
+rect 9938 2348 10022 2372
+rect 9938 2292 9952 2348
+rect 10008 2292 10022 2348
+rect 9938 2268 10022 2292
+rect 9938 2212 9952 2268
+rect 10008 2212 10022 2268
+rect 9938 2188 10022 2212
+rect 9938 2132 9952 2188
+rect 10008 2132 10022 2188
+rect 9938 2108 10022 2132
+rect 9938 2052 9952 2108
+rect 10008 2052 10022 2108
+rect 9938 2028 10022 2052
+rect 9938 1972 9952 2028
+rect 10008 1972 10022 2028
+rect 9938 1948 10022 1972
+rect 9938 1892 9952 1948
+rect 10008 1892 10022 1948
+rect 9938 1868 10022 1892
+rect 9938 1812 9952 1868
+rect 10008 1812 10022 1868
+rect 9938 1788 10022 1812
+rect 9938 1732 9952 1788
+rect 10008 1732 10022 1788
+rect 9938 1708 10022 1732
+rect 9938 1652 9952 1708
+rect 10008 1652 10022 1708
+rect 9938 1628 10022 1652
+rect 9938 1572 9952 1628
+rect 10008 1572 10022 1628
+rect 9938 1548 10022 1572
+rect 9938 1492 9952 1548
+rect 10008 1492 10022 1548
+rect 9938 1468 10022 1492
+rect 9938 1412 9952 1468
+rect 10008 1412 10022 1468
+rect 9938 1388 10022 1412
+rect 9938 1332 9952 1388
+rect 10008 1332 10022 1388
+rect 9938 1308 10022 1332
+rect 9938 1252 9952 1308
+rect 10008 1252 10022 1308
+rect 9938 1228 10022 1252
+rect 9938 1172 9952 1228
+rect 10008 1172 10022 1228
+rect 9938 1148 10022 1172
+rect 9938 1092 9952 1148
+rect 10008 1092 10022 1148
+rect 9938 1068 10022 1092
+rect 9938 1012 9952 1068
+rect 10008 1012 10022 1068
+rect 9938 988 10022 1012
+rect 9938 932 9952 988
+rect 10008 932 10022 988
+rect 9938 908 10022 932
+rect 9938 852 9952 908
+rect 10008 852 10022 908
+rect 9938 828 10022 852
+rect 9938 772 9952 828
+rect 10008 772 10022 828
+rect 9938 748 10022 772
+rect 9938 692 9952 748
+rect 10008 692 10022 748
+rect 9938 668 10022 692
+rect 9938 612 9952 668
+rect 10008 612 10022 668
+rect 9938 588 10022 612
+rect 9938 532 9952 588
+rect 10008 532 10022 588
+rect 9938 508 10022 532
+rect 9938 452 9952 508
+rect 10008 452 10022 508
+rect 9938 428 10022 452
+rect 9938 372 9952 428
+rect 10008 372 10022 428
+rect 9938 348 10022 372
+rect 9938 292 9952 348
+rect 10008 292 10022 348
+rect 9938 268 10022 292
+rect 9938 212 9952 268
+rect 10008 212 10022 268
+rect 9938 188 10022 212
+rect 9938 132 9952 188
+rect 10008 132 10022 188
+rect 9938 108 10022 132
+rect 9938 52 9952 108
+rect 10008 52 10022 108
+rect 9938 18 10022 52
+<< via2 >>
+rect 9952 4532 10008 4588
+rect 9952 4452 10008 4508
+rect 9952 4372 10008 4428
+rect 9952 4292 10008 4348
+rect 9952 4212 10008 4268
+rect 9952 4132 10008 4188
+rect 9952 4052 10008 4108
+rect 9952 3972 10008 4028
+rect 9952 3892 10008 3948
+rect 9952 3812 10008 3868
+rect 9952 3732 10008 3788
+rect 9952 3652 10008 3708
+rect 9952 3572 10008 3628
+rect 9952 3492 10008 3548
+rect 9952 3412 10008 3468
+rect 9952 3332 10008 3388
+rect 9952 3252 10008 3308
+rect 9952 3172 10008 3228
+rect 9952 3092 10008 3148
+rect 9952 3012 10008 3068
+rect 9952 2932 10008 2988
+rect 9952 2852 10008 2908
+rect 9952 2772 10008 2828
+rect 9952 2692 10008 2748
+rect 9952 2612 10008 2668
+rect 9952 2532 10008 2588
+rect 9952 2452 10008 2508
+rect 9952 2372 10008 2428
+rect 9952 2292 10008 2348
+rect 9952 2212 10008 2268
+rect 9952 2132 10008 2188
+rect 9952 2052 10008 2108
+rect 9952 1972 10008 2028
+rect 9952 1892 10008 1948
+rect 9952 1812 10008 1868
+rect 9952 1732 10008 1788
+rect 9952 1652 10008 1708
+rect 9952 1572 10008 1628
+rect 9952 1492 10008 1548
+rect 9952 1412 10008 1468
+rect 9952 1332 10008 1388
+rect 9952 1252 10008 1308
+rect 9952 1172 10008 1228
+rect 9952 1092 10008 1148
+rect 9952 1012 10008 1068
+rect 9952 932 10008 988
+rect 9952 852 10008 908
+rect 9952 772 10008 828
+rect 9952 692 10008 748
+rect 9952 612 10008 668
+rect 9952 532 10008 588
+rect 9952 452 10008 508
+rect 9952 372 10008 428
+rect 9952 292 10008 348
+rect 9952 212 10008 268
+rect 9952 132 10008 188
+rect 9952 52 10008 108
+<< metal3 >>
+rect 6000 5154 6320 5190
+rect 6000 4930 6048 5154
+rect 6272 4930 6320 5154
+rect 6000 4640 6320 4930
+rect 5016 4588 10032 4640
+rect 5016 4532 9952 4588
+rect 10008 4532 10032 4588
+rect 5016 4508 10032 4532
+rect 5016 4452 9952 4508
+rect 10008 4452 10032 4508
+rect 5016 4428 10032 4452
+rect 5016 4374 9952 4428
+rect 6000 4372 9952 4374
+rect 10008 4372 10032 4428
+rect 6000 4348 10032 4372
+rect 6000 4292 9952 4348
+rect 10008 4292 10032 4348
+rect 6000 4268 10032 4292
+rect 6000 4212 9952 4268
+rect 10008 4212 10032 4268
+rect 6000 4188 10032 4212
+rect 6000 4132 9952 4188
+rect 10008 4132 10032 4188
+rect 6000 4108 10032 4132
+rect 6000 4052 9952 4108
+rect 10008 4052 10032 4108
+rect 6000 4028 10032 4052
+rect 6000 3972 9952 4028
+rect 10008 3972 10032 4028
+rect 6000 3948 10032 3972
+rect 6000 3892 9952 3948
+rect 10008 3892 10032 3948
+rect 6000 3868 10032 3892
+rect 6000 3812 9952 3868
+rect 10008 3812 10032 3868
+rect 6000 3788 10032 3812
+rect 6000 3732 9952 3788
+rect 10008 3732 10032 3788
+rect 6000 3708 10032 3732
+rect 6000 3652 9952 3708
+rect 10008 3652 10032 3708
+rect 6000 3628 10032 3652
+rect 6000 3572 9952 3628
+rect 10008 3572 10032 3628
+rect 6000 3548 10032 3572
+rect 6000 3492 9952 3548
+rect 10008 3492 10032 3548
+rect 6000 3468 10032 3492
+rect 6000 3412 9952 3468
+rect 10008 3412 10032 3468
+rect 6000 3388 10032 3412
+rect 6000 3332 9952 3388
+rect 10008 3332 10032 3388
+rect 6000 3308 10032 3332
+rect 6000 3252 9952 3308
+rect 10008 3252 10032 3308
+rect 6000 3228 10032 3252
+rect 6000 3172 9952 3228
+rect 10008 3172 10032 3228
+rect 6000 3148 10032 3172
+rect 6000 3092 9952 3148
+rect 10008 3092 10032 3148
+rect 6000 3068 10032 3092
+rect 6000 3012 9952 3068
+rect 10008 3012 10032 3068
+rect 6000 2988 10032 3012
+rect 6000 2932 9952 2988
+rect 10008 2932 10032 2988
+rect 6000 2908 10032 2932
+rect 6000 2852 9952 2908
+rect 10008 2852 10032 2908
+rect 6000 2828 10032 2852
+rect 6000 2772 9952 2828
+rect 10008 2772 10032 2828
+rect 6000 2748 10032 2772
+rect 6000 2692 9952 2748
+rect 10008 2692 10032 2748
+rect 6000 2668 10032 2692
+rect 6000 2612 9952 2668
+rect 10008 2612 10032 2668
+rect 6000 2588 10032 2612
+rect 6000 2532 9952 2588
+rect 10008 2532 10032 2588
+rect 6000 2508 10032 2532
+rect 6000 2452 9952 2508
+rect 10008 2452 10032 2508
+rect 6000 2428 10032 2452
+rect 6000 2372 9952 2428
+rect 10008 2372 10032 2428
+rect 6000 2348 10032 2372
+rect 6000 2292 9952 2348
+rect 10008 2292 10032 2348
+rect 6000 2268 10032 2292
+rect 6000 2212 9952 2268
+rect 10008 2212 10032 2268
+rect 6000 2188 10032 2212
+rect 6000 2132 9952 2188
+rect 10008 2132 10032 2188
+rect 6000 2108 10032 2132
+rect 6000 2052 9952 2108
+rect 10008 2052 10032 2108
+rect 6000 2028 10032 2052
+rect 6000 1972 9952 2028
+rect 10008 1972 10032 2028
+rect 6000 1948 10032 1972
+rect 6000 1892 9952 1948
+rect 10008 1892 10032 1948
+rect 6000 1868 10032 1892
+rect 6000 1812 9952 1868
+rect 10008 1812 10032 1868
+rect 6000 1788 10032 1812
+rect 6000 1732 9952 1788
+rect 10008 1732 10032 1788
+rect 6000 1708 10032 1732
+rect 6000 1652 9952 1708
+rect 10008 1652 10032 1708
+rect 6000 1628 10032 1652
+rect 6000 1572 9952 1628
+rect 10008 1572 10032 1628
+rect 6000 1548 10032 1572
+rect 6000 1492 9952 1548
+rect 10008 1492 10032 1548
+rect 6000 1468 10032 1492
+rect 6000 1412 9952 1468
+rect 10008 1412 10032 1468
+rect 6000 1388 10032 1412
+rect 6000 1332 9952 1388
+rect 10008 1332 10032 1388
+rect 6000 1308 10032 1332
+rect 6000 1252 9952 1308
+rect 10008 1252 10032 1308
+rect 6000 1228 10032 1252
+rect 6000 1172 9952 1228
+rect 10008 1172 10032 1228
+rect 6000 1148 10032 1172
+rect 6000 1092 9952 1148
+rect 10008 1092 10032 1148
+rect 6000 1068 10032 1092
+rect 6000 1012 9952 1068
+rect 10008 1012 10032 1068
+rect 6000 988 10032 1012
+rect 6000 932 9952 988
+rect 10008 932 10032 988
+rect 6000 908 10032 932
+rect 6000 852 9952 908
+rect 10008 852 10032 908
+rect 6000 828 10032 852
+rect 6000 772 9952 828
+rect 10008 772 10032 828
+rect 6000 748 10032 772
+rect 6000 692 9952 748
+rect 10008 692 10032 748
+rect 6000 668 10032 692
+rect 6000 612 9952 668
+rect 10008 612 10032 668
+rect 6000 588 10032 612
+rect 6000 532 9952 588
+rect 10008 532 10032 588
+rect 6000 508 10032 532
+rect 6000 452 9952 508
+rect 10008 452 10032 508
+rect 6000 428 10032 452
+rect 6000 372 9952 428
+rect 10008 372 10032 428
+rect 6000 348 10032 372
+rect 6000 292 9952 348
+rect 10008 292 10032 348
+rect 6000 268 10032 292
+rect 6000 212 9952 268
+rect 10008 212 10032 268
+rect 6000 188 10032 212
+rect 6000 132 9952 188
+rect 10008 132 10032 188
+rect 6000 108 10032 132
+rect 6000 52 9952 108
+rect 10008 52 10032 108
+rect 4130 -116 4414 2
+rect 6000 0 10032 52
+rect 4130 -340 4162 -116
+rect 4386 -340 4414 -116
+rect 4130 -432 4414 -340
+<< via3 >>
+rect 6048 4930 6272 5154
+rect 4162 -340 4386 -116
+<< mimcap >>
+rect 6100 4472 9860 4540
+rect 6100 168 9656 4472
+rect 9800 168 9860 4472
+rect 6100 100 9860 168
+<< mimcapcontact >>
+rect 9656 168 9800 4472
+<< metal4 >>
+rect 8628 5268 9822 5306
+rect 6000 5154 6320 5190
+rect 3470 5094 4558 5142
+rect 3470 4858 3506 5094
+rect 3742 4858 4558 5094
+rect 3470 4826 4558 4858
+rect 4490 4498 4558 4826
+rect 6000 4930 6048 5154
+rect 6272 4930 6320 5154
+rect 8848 5014 9822 5268
+rect 6000 4640 6320 4930
+rect 9634 4472 9822 5014
+rect 9634 168 9656 4472
+rect 9800 168 9822 4472
+rect 9634 138 9822 168
+rect 4130 -116 4414 2
+rect 4130 -340 4162 -116
+rect 4386 -340 4414 -116
+rect 4130 -432 4414 -340
+<< via4 >>
+rect 3506 4858 3742 5094
+rect 8612 5032 8848 5268
+<< metal5 >>
+rect 8526 5268 8936 5306
+rect 3472 5094 3792 5140
+rect 3472 4858 3506 5094
+rect 3742 4858 3792 5094
+rect 3472 4524 3792 4858
+rect 8526 5032 8612 5268
+rect 8848 5032 8936 5268
+rect 3472 4500 3506 4524
+rect 8526 4500 8936 5032
+use sky130_fd_pr__cap_mim_m3_2_4SGG6N  sky130_fd_pr__cap_mim_m3_2_4SGG6N_0
+timestamp 1640975112
+transform 1 0 7323 0 1 2320
+box -2231 -2321 2253 2321
+use sky130_fd_pr__cap_mim_m3_1_9K4XRG  sky130_fd_pr__cap_mim_m3_1_9K4XRG_0
+timestamp 1640975112
+transform 1 0 4560 0 1 2320
+box -456 -2320 456 2320
+use sky130_fd_pr__cap_mim_m3_2_7PBNAZ  sky130_fd_pr__cap_mim_m3_2_7PBNAZ_0
+timestamp 1640975112
+transform 1 0 3739 0 1 2320
+box -671 -2321 693 2321
+<< labels >>
+flabel metal4 s 6140 4764 6140 4764 0 FreeSans 2000 0 0 0 BOT
+port 1 nsew
+flabel metal4 s 4110 4986 4110 4986 0 FreeSans 2000 0 0 0 TOP_V
+port 2 nsew
+flabel metal4 s 9210 5152 9210 5152 0 FreeSans 2000 0 0 0 TOP_B
+port 3 nsew
+<< end >>
diff --git a/mag/DFF_v3p1.mag b/mag/DFF_v3p1.mag
new file mode 100644
index 0000000..a548aa7
--- /dev/null
+++ b/mag/DFF_v3p1.mag
@@ -0,0 +1,497 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< error_s >>
+rect -359 602 -295 636
+rect 241 602 305 636
+rect 641 602 705 636
+rect 841 602 905 636
+rect -621 356 -594 584
+rect -593 356 -566 556
+rect -513 371 -511 586
+rect -557 356 -541 371
+rect -513 356 -497 371
+rect -488 356 -461 556
+rect -460 356 -433 556
+rect -421 356 -394 556
+rect -393 356 -366 556
+rect -313 330 -311 586
+rect -21 556 -14 584
+rect -21 518 6 556
+rect 7 490 34 556
+rect 87 330 89 586
+rect 112 356 139 556
+rect 140 356 167 556
+rect 179 356 206 556
+rect 207 356 234 556
+rect 287 330 289 586
+rect 354 560 367 594
+rect 300 488 333 560
+rect 334 522 367 560
+rect 612 352 613 386
+rect 687 330 689 586
+rect 712 356 739 556
+rect 740 356 767 556
+rect 779 356 806 556
+rect 807 356 834 556
+rect 887 371 889 586
+rect 843 356 859 371
+rect 887 356 903 371
+rect 912 356 939 556
+rect 940 356 967 584
+rect -512 226 -511 251
+rect -557 211 -541 226
+rect -513 211 -497 226
+rect -513 0 -511 211
+rect -421 -1 -394 226
+rect -393 27 -366 225
+rect -313 5 -311 251
+rect -288 27 -261 225
+rect -260 26 -233 226
+rect -221 26 -194 226
+rect -193 27 -166 225
+rect -113 5 -111 251
+rect -22 226 34 254
+rect 57 252 58 282
+rect 88 252 89 282
+rect 257 252 258 282
+rect 288 252 289 282
+rect -88 27 -61 225
+rect -60 26 -33 226
+rect -22 198 6 226
+rect -21 26 6 198
+rect 7 26 34 226
+rect 87 0 89 252
+rect 112 26 139 226
+rect 140 26 167 226
+rect 179 26 206 226
+rect 207 26 234 226
+rect 287 0 289 252
+rect 312 226 368 254
+rect 312 26 339 226
+rect 340 198 368 226
+rect 340 26 367 198
+rect 379 26 406 226
+rect 407 27 434 225
+rect 487 5 489 251
+rect 512 27 539 225
+rect 540 26 567 226
+rect 579 26 606 226
+rect 607 27 634 225
+rect 687 5 689 251
+rect 888 226 889 256
+rect 712 27 739 225
+rect 740 -1 767 226
+rect 843 211 859 226
+rect 887 211 903 226
+rect 887 0 889 211
+rect -359 -45 -295 -11
+rect -159 -45 -95 -11
+rect 441 -45 505 -11
+rect 641 -45 705 -11
+<< nwell >>
+rect -636 294 982 904
+<< pwell >>
+rect -472 -204 818 -70
+<< psubdiff >>
+rect -446 -120 792 -96
+rect -446 -154 -422 -120
+rect -388 -154 -354 -120
+rect -320 -154 -286 -120
+rect -252 -154 -218 -120
+rect -184 -154 -150 -120
+rect -116 -154 -82 -120
+rect -48 -154 -14 -120
+rect 20 -154 54 -120
+rect 88 -154 122 -120
+rect 156 -154 190 -120
+rect 224 -154 258 -120
+rect 292 -154 326 -120
+rect 360 -154 394 -120
+rect 428 -154 462 -120
+rect 496 -154 530 -120
+rect 564 -154 598 -120
+rect 632 -154 666 -120
+rect 700 -154 734 -120
+rect 768 -154 792 -120
+rect -446 -178 792 -154
+<< nsubdiff >>
+rect 2 824 336 852
+rect 2 790 50 824
+rect 84 790 118 824
+rect 152 790 186 824
+rect 220 790 254 824
+rect 288 790 336 824
+rect 2 692 336 790
+<< psubdiffcont >>
+rect -422 -154 -388 -120
+rect -354 -154 -320 -120
+rect -286 -154 -252 -120
+rect -218 -154 -184 -120
+rect -150 -154 -116 -120
+rect -82 -154 -48 -120
+rect -14 -154 20 -120
+rect 54 -154 88 -120
+rect 122 -154 156 -120
+rect 190 -154 224 -120
+rect 258 -154 292 -120
+rect 326 -154 360 -120
+rect 394 -154 428 -120
+rect 462 -154 496 -120
+rect 530 -154 564 -120
+rect 598 -154 632 -120
+rect 666 -154 700 -120
+rect 734 -154 768 -120
+<< nsubdiffcont >>
+rect 50 790 84 824
+rect 118 790 152 824
+rect 186 790 220 824
+rect 254 790 288 824
+<< poly >>
+rect -542 226 -512 356
+rect 58 252 88 330
+rect 258 252 288 330
+rect 858 226 888 356
+<< locali >>
+rect 14 824 324 840
+rect 14 790 44 824
+rect 84 790 116 824
+rect 152 790 186 824
+rect 222 790 254 824
+rect 294 790 324 824
+rect 14 774 324 790
+rect 50 692 400 738
+rect -678 602 -494 638
+rect 50 604 96 692
+rect -678 316 -644 602
+rect 354 560 400 692
+rect 334 522 400 560
+rect 612 316 646 352
+rect -678 282 646 316
+rect -440 -120 786 -96
+rect -440 -154 -422 -120
+rect -386 -154 -354 -120
+rect -314 -154 -286 -120
+rect -242 -154 -218 -120
+rect -170 -154 -150 -120
+rect -98 -154 -82 -120
+rect -26 -154 -14 -120
+rect 46 -154 54 -120
+rect 118 -154 122 -120
+rect 224 -154 228 -120
+rect 292 -154 300 -120
+rect 360 -154 372 -120
+rect 428 -154 444 -120
+rect 496 -154 516 -120
+rect 564 -154 588 -120
+rect 632 -154 660 -120
+rect 700 -154 732 -120
+rect 768 -154 786 -120
+rect -440 -174 786 -154
+<< viali >>
+rect 44 790 50 824
+rect 50 790 78 824
+rect 116 790 118 824
+rect 118 790 150 824
+rect 188 790 220 824
+rect 220 790 222 824
+rect 260 790 288 824
+rect 288 790 294 824
+rect -420 -154 -388 -120
+rect -388 -154 -386 -120
+rect -348 -154 -320 -120
+rect -320 -154 -314 -120
+rect -276 -154 -252 -120
+rect -252 -154 -242 -120
+rect -204 -154 -184 -120
+rect -184 -154 -170 -120
+rect -132 -154 -116 -120
+rect -116 -154 -98 -120
+rect -60 -154 -48 -120
+rect -48 -154 -26 -120
+rect 12 -154 20 -120
+rect 20 -154 46 -120
+rect 84 -154 88 -120
+rect 88 -154 118 -120
+rect 156 -154 190 -120
+rect 228 -154 258 -120
+rect 258 -154 262 -120
+rect 300 -154 326 -120
+rect 326 -154 334 -120
+rect 372 -154 394 -120
+rect 394 -154 406 -120
+rect 444 -154 462 -120
+rect 462 -154 478 -120
+rect 516 -154 530 -120
+rect 530 -154 550 -120
+rect 588 -154 598 -120
+rect 598 -154 622 -120
+rect 660 -154 666 -120
+rect 666 -154 694 -120
+rect 732 -154 734 -120
+rect 734 -154 766 -120
+<< metal1 >>
+rect 138 842 208 848
+rect 138 840 147 842
+rect -640 824 147 840
+rect 199 840 208 842
+rect 199 824 986 840
+rect -640 790 44 824
+rect 78 790 116 824
+rect 222 790 260 824
+rect 294 790 986 824
+rect -640 776 986 790
+rect -640 356 -594 776
+rect 14 774 324 776
+rect -60 692 296 738
+rect -550 655 -486 662
+rect -550 654 -544 655
+rect -560 603 -544 654
+rect -492 603 -486 655
+rect -350 655 -286 662
+rect -350 654 -344 655
+rect -560 596 -486 603
+rect -360 603 -344 654
+rect -292 603 -286 655
+rect -360 596 -286 603
+rect -560 586 -494 596
+rect -360 586 -294 596
+rect -60 556 -14 692
+rect 40 588 106 654
+rect 250 652 296 692
+rect 632 655 696 662
+rect 240 586 306 652
+rect 632 603 638 655
+rect 690 654 696 655
+rect 832 654 896 660
+rect 690 603 706 654
+rect 632 596 706 603
+rect 832 602 838 654
+rect 890 602 906 654
+rect 832 596 906 602
+rect 640 586 706 596
+rect 840 586 906 596
+rect -460 356 -394 556
+rect -60 518 6 556
+rect 140 541 206 556
+rect 140 489 147 541
+rect 199 489 206 541
+rect 140 356 206 489
+rect 740 356 806 556
+rect 940 356 986 776
+rect -600 316 -536 322
+rect -306 316 -260 356
+rect -600 264 -594 316
+rect -542 266 -260 316
+rect -542 264 -536 266
+rect -600 258 -536 264
+rect -594 226 -548 258
+rect 6 226 52 356
+rect 294 226 340 356
+rect 606 316 652 356
+rect 882 316 946 322
+rect 606 266 888 316
+rect 882 264 888 266
+rect 940 264 946 316
+rect 882 258 946 264
+rect 894 226 940 258
+rect -466 26 -394 226
+rect -260 26 -194 226
+rect -60 26 6 226
+rect 140 26 206 226
+rect 340 26 406 226
+rect 540 26 606 226
+rect 740 26 812 226
+rect -440 -108 -394 26
+rect -360 -6 -294 -4
+rect -160 -6 -94 -4
+rect -360 -12 -286 -6
+rect -360 -62 -344 -12
+rect -350 -64 -344 -62
+rect -292 -64 -286 -12
+rect -160 -12 -86 -6
+rect -160 -62 -144 -12
+rect -350 -70 -286 -64
+rect -150 -64 -144 -62
+rect -92 -64 -86 -12
+rect -150 -70 -86 -64
+rect 94 -108 252 26
+rect 440 -6 506 -4
+rect 640 -6 706 -4
+rect 432 -12 506 -6
+rect 432 -64 438 -12
+rect 490 -62 506 -12
+rect 632 -12 706 -6
+rect 490 -64 496 -62
+rect 432 -70 496 -64
+rect 632 -64 638 -12
+rect 690 -62 706 -12
+rect 690 -64 696 -62
+rect 632 -70 696 -64
+rect 740 -108 786 26
+rect -440 -120 786 -108
+rect -440 -154 -420 -120
+rect -386 -154 -348 -120
+rect -314 -154 -276 -120
+rect -242 -154 -204 -120
+rect -170 -154 -132 -120
+rect -98 -154 -60 -120
+rect -26 -154 12 -120
+rect 46 -154 84 -120
+rect 118 -154 156 -120
+rect 190 -154 228 -120
+rect 262 -154 300 -120
+rect 334 -154 372 -120
+rect 406 -154 444 -120
+rect 478 -154 516 -120
+rect 550 -154 588 -120
+rect 622 -154 660 -120
+rect 694 -154 732 -120
+rect 766 -154 786 -120
+rect -440 -166 786 -154
+<< via1 >>
+rect 147 824 199 842
+rect 147 790 150 824
+rect 150 790 188 824
+rect 188 790 199 824
+rect -544 603 -492 655
+rect -344 603 -292 655
+rect 638 603 690 655
+rect 838 602 890 654
+rect 147 489 199 541
+rect -594 264 -542 316
+rect 888 264 940 316
+rect -344 -64 -292 -12
+rect -144 -64 -92 -12
+rect 438 -64 490 -12
+rect 638 -64 690 -12
+<< metal2 >>
+rect 138 842 208 848
+rect 138 790 147 842
+rect 199 790 208 842
+rect 138 784 208 790
+rect -550 655 -486 662
+rect -550 603 -544 655
+rect -492 603 -486 655
+rect -550 596 -486 603
+rect -350 655 -286 662
+rect -350 603 -344 655
+rect -292 603 -286 655
+rect -350 440 -286 603
+rect 150 548 196 784
+rect 632 655 696 662
+rect 632 603 638 655
+rect 690 603 696 655
+rect 140 541 206 548
+rect 140 489 147 541
+rect 199 489 206 541
+rect 140 482 206 489
+rect 632 440 696 603
+rect 832 654 896 660
+rect 832 602 838 654
+rect 890 602 896 654
+rect 832 596 896 602
+rect -350 374 696 440
+rect -600 316 -536 324
+rect -600 264 -594 316
+rect -542 264 -536 316
+rect -600 -106 -536 264
+rect 150 108 196 374
+rect 882 316 946 322
+rect 882 264 888 316
+rect 940 264 946 316
+rect -350 44 696 108
+rect -350 -12 -286 44
+rect -350 -64 -344 -12
+rect -292 -64 -286 -12
+rect -350 -70 -286 -64
+rect -150 -12 -84 -6
+rect -150 -64 -144 -12
+rect -92 -64 -84 -12
+rect -150 -106 -84 -64
+rect -600 -166 -84 -106
+rect 432 -12 496 -6
+rect 432 -64 438 -12
+rect 490 -64 496 -12
+rect 432 -106 496 -64
+rect 632 -12 696 44
+rect 632 -64 638 -12
+rect 690 -64 696 -12
+rect 632 -70 696 -64
+rect 882 -106 946 264
+rect 432 -166 946 -106
+use sky130_fd_pr__nfet_01v8_59MFY5  sky130_fd_pr__nfet_01v8_59MFY5_0
+timestamp 1640975112
+transform 1 0 -327 0 1 95
+box -98 -156 98 156
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_1
+timestamp 1640975112
+transform 1 0 -527 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__nfet_01v8_6H9P4D  sky130_fd_pr__nfet_01v8_6H9P4D_0
+timestamp 1640975112
+transform 1 0 -527 0 1 126
+box -98 -126 98 126
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_0
+timestamp 1640975112
+transform 1 0 -327 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__nfet_01v8_59MFY5  sky130_fd_pr__nfet_01v8_59MFY5_1
+timestamp 1640975112
+transform 1 0 -127 0 1 95
+box -98 -156 98 156
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_2
+timestamp 1640975112
+transform 1 0 73 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__nfet_01v8_6H9P4D  sky130_fd_pr__nfet_01v8_6H9P4D_1
+timestamp 1640975112
+transform 1 0 73 0 1 126
+box -98 -126 98 126
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_3
+timestamp 1640975112
+transform 1 0 273 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__nfet_01v8_6H9P4D  sky130_fd_pr__nfet_01v8_6H9P4D_2
+timestamp 1640975112
+transform 1 0 273 0 1 126
+box -98 -126 98 126
+use sky130_fd_pr__nfet_01v8_59MFY5  sky130_fd_pr__nfet_01v8_59MFY5_2
+timestamp 1640975112
+transform 1 0 473 0 1 95
+box -98 -156 98 156
+use sky130_fd_pr__nfet_01v8_59MFY5  sky130_fd_pr__nfet_01v8_59MFY5_3
+timestamp 1640975112
+transform 1 0 673 0 1 95
+box -98 -156 98 156
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_4
+timestamp 1640975112
+transform 1 0 673 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__pfet_01v8_MA8JHN  sky130_fd_pr__pfet_01v8_MA8JHN_5
+timestamp 1640975112
+transform 1 0 873 0 1 492
+box -108 -198 108 164
+use sky130_fd_pr__nfet_01v8_6H9P4D  sky130_fd_pr__nfet_01v8_6H9P4D_3
+timestamp 1640975112
+transform 1 0 873 0 1 126
+box -98 -126 98 126
+<< labels >>
+flabel metal2 s 476 -40 476 -40 0 FreeSans 600 0 0 0 NDIFF
+port 1 nsew
+flabel metal2 s -120 -32 -120 -32 0 FreeSans 600 0 0 0 PDIFF
+port 2 nsew
+flabel metal2 s 172 758 172 758 0 FreeSans 600 0 0 0 VDD
+port 3 nsew
+flabel metal2 s 170 76 170 76 0 FreeSans 600 0 0 0 CLK
+port 4 nsew
+flabel metal1 s -40 630 -40 630 0 FreeSans 600 0 0 0 ND
+port 5 nsew
+flabel locali s 380 624 380 624 0 FreeSans 600 0 0 0 D
+port 6 nsew
+flabel metal1 s 168 -76 168 -76 0 FreeSans 600 0 0 0 GND
+port 7 nsew
+flabel metal2 s 868 624 868 624 0 FreeSans 600 0 0 0 IN
+port 8 nsew
+<< end >>
diff --git a/mag/INVMIN_v1p1.mag b/mag/INVMIN_v1p1.mag
new file mode 100644
index 0000000..71d5fa1
--- /dev/null
+++ b/mag/INVMIN_v1p1.mag
@@ -0,0 +1,171 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< nwell >>
+rect -300 250 170 530
+<< pwell >>
+rect -286 -46 156 206
+<< nmos >>
+rect -20 -20 10 180
+<< pmos >>
+rect -20 290 10 490
+<< ndiff >>
+rect -140 131 -20 180
+rect -140 97 -97 131
+rect -63 97 -20 131
+rect -140 63 -20 97
+rect -140 29 -97 63
+rect -63 29 -20 63
+rect -140 -20 -20 29
+rect 10 131 130 180
+rect 10 97 53 131
+rect 87 97 130 131
+rect 10 63 130 97
+rect 10 29 53 63
+rect 87 29 130 63
+rect 10 -20 130 29
+<< pdiff >>
+rect -140 441 -20 490
+rect -140 407 -97 441
+rect -63 407 -20 441
+rect -140 373 -20 407
+rect -140 339 -97 373
+rect -63 339 -20 373
+rect -140 290 -20 339
+rect 10 441 130 490
+rect 10 407 53 441
+rect 87 407 130 441
+rect 10 373 130 407
+rect 10 339 53 373
+rect 87 339 130 373
+rect 10 290 130 339
+<< ndiffc >>
+rect -97 97 -63 131
+rect -97 29 -63 63
+rect 53 97 87 131
+rect 53 29 87 63
+<< pdiffc >>
+rect -97 407 -63 441
+rect -97 339 -63 373
+rect 53 407 87 441
+rect 53 339 87 373
+<< psubdiff >>
+rect -260 131 -140 180
+rect -260 97 -217 131
+rect -183 97 -140 131
+rect -260 63 -140 97
+rect -260 29 -217 63
+rect -183 29 -140 63
+rect -260 -20 -140 29
+<< nsubdiff >>
+rect -260 441 -140 490
+rect -260 407 -217 441
+rect -183 407 -140 441
+rect -260 373 -140 407
+rect -260 339 -217 373
+rect -183 339 -140 373
+rect -260 290 -140 339
+<< psubdiffcont >>
+rect -217 97 -183 131
+rect -217 29 -183 63
+<< nsubdiffcont >>
+rect -217 407 -183 441
+rect -217 339 -183 373
+<< poly >>
+rect -20 490 10 520
+rect -20 180 10 290
+rect -20 -50 10 -20
+rect -90 -83 10 -50
+rect -90 -117 -57 -83
+rect -23 -117 10 -83
+rect -90 -150 10 -117
+<< polycont >>
+rect -57 -117 -23 -83
+<< locali >>
+rect -250 443 -30 480
+rect -250 407 -217 443
+rect -183 407 -97 443
+rect -63 407 -30 443
+rect -250 373 -30 407
+rect -250 337 -217 373
+rect -183 337 -97 373
+rect -63 337 -30 373
+rect -250 300 -30 337
+rect 20 441 120 480
+rect 20 407 53 441
+rect 87 407 120 441
+rect 20 373 120 407
+rect 20 339 53 373
+rect 87 339 120 373
+rect 20 300 120 339
+rect 70 170 120 300
+rect -250 133 -30 170
+rect -250 97 -217 133
+rect -183 97 -97 133
+rect -63 97 -30 133
+rect -250 63 -30 97
+rect -250 27 -217 63
+rect -183 27 -97 63
+rect -63 27 -30 63
+rect -250 -10 -30 27
+rect 20 131 120 170
+rect 20 97 53 131
+rect 87 97 120 131
+rect 20 63 120 97
+rect 20 29 53 63
+rect 87 29 120 63
+rect 20 -10 120 29
+rect 70 -50 120 -10
+rect -300 -83 10 -50
+rect -300 -100 -57 -83
+rect -90 -117 -57 -100
+rect -23 -117 10 -83
+rect 70 -100 170 -50
+rect -90 -150 10 -117
+<< viali >>
+rect -217 441 -183 443
+rect -217 409 -183 441
+rect -97 441 -63 443
+rect -97 409 -63 441
+rect -217 339 -183 371
+rect -217 337 -183 339
+rect -97 339 -63 371
+rect -97 337 -63 339
+rect -217 131 -183 133
+rect -217 99 -183 131
+rect -97 131 -63 133
+rect -97 99 -63 131
+rect -217 29 -183 61
+rect -217 27 -183 29
+rect -97 29 -63 61
+rect -97 27 -63 29
+<< metal1 >>
+rect -300 443 170 480
+rect -300 409 -217 443
+rect -183 409 -97 443
+rect -63 409 170 443
+rect -300 371 170 409
+rect -300 337 -217 371
+rect -183 337 -97 371
+rect -63 337 170 371
+rect -300 300 170 337
+rect -300 133 170 170
+rect -300 99 -217 133
+rect -183 99 -97 133
+rect -63 99 170 133
+rect -300 61 170 99
+rect -300 27 -217 61
+rect -183 27 -97 61
+rect -63 27 170 61
+rect -300 -10 170 27
+<< labels >>
+rlabel locali s -300 -80 -300 -80 4 VIN
+port 1 nsew
+rlabel locali s 170 -80 170 -80 4 VOUT
+port 2 nsew
+rlabel metal1 s -300 390 -300 390 4 VDD
+port 3 nsew
+rlabel metal1 s -300 80 -300 80 4 VSS
+port 4 nsew
+<< end >>
diff --git a/mag/INV_v1p1.mag b/mag/INV_v1p1.mag
new file mode 100644
index 0000000..db3ea3a
--- /dev/null
+++ b/mag/INV_v1p1.mag
@@ -0,0 +1,511 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< nwell >>
+rect 1366 442 2276 1080
+<< pwell >>
+rect 1376 -168 1882 432
+<< nmos >>
+rect 1566 32 1596 232
+rect 1662 32 1692 232
+<< pmos >>
+rect 1566 661 1596 861
+rect 1662 661 1692 861
+rect 1758 661 1788 861
+rect 1854 661 1884 861
+rect 1950 661 1980 861
+rect 2046 661 2076 861
+<< ndiff >>
+rect 1504 217 1566 232
+rect 1504 183 1516 217
+rect 1550 183 1566 217
+rect 1504 149 1566 183
+rect 1504 115 1516 149
+rect 1550 115 1566 149
+rect 1504 81 1566 115
+rect 1504 47 1516 81
+rect 1550 47 1566 81
+rect 1504 32 1566 47
+rect 1596 217 1662 232
+rect 1596 183 1612 217
+rect 1646 183 1662 217
+rect 1596 149 1662 183
+rect 1596 115 1612 149
+rect 1646 115 1662 149
+rect 1596 81 1662 115
+rect 1596 47 1612 81
+rect 1646 47 1662 81
+rect 1596 32 1662 47
+rect 1692 217 1754 232
+rect 1692 183 1708 217
+rect 1742 183 1754 217
+rect 1692 149 1754 183
+rect 1692 115 1708 149
+rect 1742 115 1754 149
+rect 1692 81 1754 115
+rect 1692 47 1708 81
+rect 1742 47 1754 81
+rect 1692 32 1754 47
+<< pdiff >>
+rect 1504 846 1566 861
+rect 1504 812 1516 846
+rect 1550 812 1566 846
+rect 1504 778 1566 812
+rect 1504 744 1516 778
+rect 1550 744 1566 778
+rect 1504 710 1566 744
+rect 1504 676 1516 710
+rect 1550 676 1566 710
+rect 1504 661 1566 676
+rect 1596 846 1662 861
+rect 1596 812 1612 846
+rect 1646 812 1662 846
+rect 1596 778 1662 812
+rect 1596 744 1612 778
+rect 1646 744 1662 778
+rect 1596 710 1662 744
+rect 1596 676 1612 710
+rect 1646 676 1662 710
+rect 1596 661 1662 676
+rect 1692 846 1758 861
+rect 1692 812 1708 846
+rect 1742 812 1758 846
+rect 1692 778 1758 812
+rect 1692 744 1708 778
+rect 1742 744 1758 778
+rect 1692 710 1758 744
+rect 1692 676 1708 710
+rect 1742 676 1758 710
+rect 1692 661 1758 676
+rect 1788 846 1854 861
+rect 1788 812 1804 846
+rect 1838 812 1854 846
+rect 1788 778 1854 812
+rect 1788 744 1804 778
+rect 1838 744 1854 778
+rect 1788 710 1854 744
+rect 1788 676 1804 710
+rect 1838 676 1854 710
+rect 1788 661 1854 676
+rect 1884 846 1950 861
+rect 1884 812 1900 846
+rect 1934 812 1950 846
+rect 1884 778 1950 812
+rect 1884 744 1900 778
+rect 1934 744 1950 778
+rect 1884 710 1950 744
+rect 1884 676 1900 710
+rect 1934 676 1950 710
+rect 1884 661 1950 676
+rect 1980 846 2046 861
+rect 1980 812 1996 846
+rect 2030 812 2046 846
+rect 1980 778 2046 812
+rect 1980 744 1996 778
+rect 2030 744 2046 778
+rect 1980 710 2046 744
+rect 1980 676 1996 710
+rect 2030 676 2046 710
+rect 1980 661 2046 676
+rect 2076 846 2138 861
+rect 2076 812 2092 846
+rect 2126 812 2138 846
+rect 2076 778 2138 812
+rect 2076 744 2092 778
+rect 2126 744 2138 778
+rect 2076 710 2138 744
+rect 2076 676 2092 710
+rect 2126 676 2138 710
+rect 2076 661 2138 676
+<< ndiffc >>
+rect 1516 183 1550 217
+rect 1516 115 1550 149
+rect 1516 47 1550 81
+rect 1612 183 1646 217
+rect 1612 115 1646 149
+rect 1612 47 1646 81
+rect 1708 183 1742 217
+rect 1708 115 1742 149
+rect 1708 47 1742 81
+<< pdiffc >>
+rect 1516 812 1550 846
+rect 1516 744 1550 778
+rect 1516 676 1550 710
+rect 1612 812 1646 846
+rect 1612 744 1646 778
+rect 1612 676 1646 710
+rect 1708 812 1742 846
+rect 1708 744 1742 778
+rect 1708 676 1742 710
+rect 1804 812 1838 846
+rect 1804 744 1838 778
+rect 1804 676 1838 710
+rect 1900 812 1934 846
+rect 1900 744 1934 778
+rect 1900 676 1934 710
+rect 1996 812 2030 846
+rect 1996 744 2030 778
+rect 1996 676 2030 710
+rect 2092 812 2126 846
+rect 2092 744 2126 778
+rect 2092 676 2126 710
+<< psubdiff >>
+rect 1402 372 1510 406
+rect 1544 372 1578 406
+rect 1612 372 1646 406
+rect 1680 372 1714 406
+rect 1748 372 1856 406
+rect 1402 285 1436 372
+rect 1402 217 1436 251
+rect 1822 285 1856 372
+rect 1402 149 1436 183
+rect 1402 81 1436 115
+rect 1402 13 1436 47
+rect 1822 217 1856 251
+rect 1822 149 1856 183
+rect 1822 81 1856 115
+rect 1822 13 1856 47
+rect 1402 -108 1436 -21
+rect 1822 -108 1856 -21
+rect 1402 -142 1510 -108
+rect 1544 -142 1578 -108
+rect 1612 -142 1646 -108
+rect 1680 -142 1714 -108
+rect 1748 -142 1856 -108
+<< nsubdiff >>
+rect 1402 1010 1498 1044
+rect 1532 1010 1566 1044
+rect 1600 1010 1634 1044
+rect 1668 1010 1702 1044
+rect 1736 1010 1770 1044
+rect 1804 1010 1838 1044
+rect 1872 1010 1906 1044
+rect 1940 1010 1974 1044
+rect 2008 1010 2042 1044
+rect 2076 1010 2110 1044
+rect 2144 1010 2240 1044
+rect 1402 948 1436 1010
+rect 2206 948 2240 1010
+rect 1402 880 1436 914
+rect 2206 880 2240 914
+rect 1402 812 1436 846
+rect 1402 744 1436 778
+rect 1402 676 1436 710
+rect 2206 812 2240 846
+rect 2206 744 2240 778
+rect 2206 676 2240 710
+rect 1402 608 1436 642
+rect 1402 512 1436 574
+rect 2206 608 2240 642
+rect 2206 512 2240 574
+rect 1402 478 1498 512
+rect 1532 478 1566 512
+rect 1600 478 1634 512
+rect 1668 478 1702 512
+rect 1736 478 1770 512
+rect 1804 478 1838 512
+rect 1872 478 1906 512
+rect 1940 478 1974 512
+rect 2008 478 2042 512
+rect 2076 478 2110 512
+rect 2144 478 2240 512
+<< psubdiffcont >>
+rect 1510 372 1544 406
+rect 1578 372 1612 406
+rect 1646 372 1680 406
+rect 1714 372 1748 406
+rect 1402 251 1436 285
+rect 1822 251 1856 285
+rect 1402 183 1436 217
+rect 1402 115 1436 149
+rect 1402 47 1436 81
+rect 1822 183 1856 217
+rect 1822 115 1856 149
+rect 1822 47 1856 81
+rect 1402 -21 1436 13
+rect 1822 -21 1856 13
+rect 1510 -142 1544 -108
+rect 1578 -142 1612 -108
+rect 1646 -142 1680 -108
+rect 1714 -142 1748 -108
+<< nsubdiffcont >>
+rect 1498 1010 1532 1044
+rect 1566 1010 1600 1044
+rect 1634 1010 1668 1044
+rect 1702 1010 1736 1044
+rect 1770 1010 1804 1044
+rect 1838 1010 1872 1044
+rect 1906 1010 1940 1044
+rect 1974 1010 2008 1044
+rect 2042 1010 2076 1044
+rect 2110 1010 2144 1044
+rect 1402 914 1436 948
+rect 1402 846 1436 880
+rect 2206 914 2240 948
+rect 1402 778 1436 812
+rect 1402 710 1436 744
+rect 1402 642 1436 676
+rect 2206 846 2240 880
+rect 2206 778 2240 812
+rect 2206 710 2240 744
+rect 1402 574 1436 608
+rect 2206 642 2240 676
+rect 2206 574 2240 608
+rect 1498 478 1532 512
+rect 1566 478 1600 512
+rect 1634 478 1668 512
+rect 1702 478 1736 512
+rect 1770 478 1804 512
+rect 1838 478 1872 512
+rect 1906 478 1940 512
+rect 1974 478 2008 512
+rect 2042 478 2076 512
+rect 2110 478 2144 512
+<< poly >>
+rect 1566 886 2076 916
+rect 1566 861 1596 886
+rect 1662 861 1692 886
+rect 1758 861 1788 886
+rect 1854 861 1884 886
+rect 1950 861 1980 886
+rect 2046 861 2076 886
+rect 1566 636 1596 661
+rect 1662 636 1692 661
+rect 1758 636 1788 661
+rect 1854 636 1884 661
+rect 1950 636 1980 661
+rect 2046 636 2076 661
+rect 1566 630 2076 636
+rect 1548 614 2076 630
+rect 1548 580 1564 614
+rect 1598 606 1756 614
+rect 1598 580 1614 606
+rect 1548 564 1614 580
+rect 1740 580 1756 606
+rect 1790 606 1948 614
+rect 1790 580 1806 606
+rect 1740 564 1806 580
+rect 1932 580 1948 606
+rect 1982 606 2076 614
+rect 1982 580 1998 606
+rect 1932 564 1998 580
+rect 1644 304 1710 320
+rect 1644 284 1660 304
+rect 1566 270 1660 284
+rect 1694 270 1710 304
+rect 1566 254 1710 270
+rect 1566 232 1596 254
+rect 1662 232 1692 254
+rect 1566 10 1596 32
+rect 1662 10 1692 32
+rect 1566 -20 1692 10
+<< polycont >>
+rect 1564 580 1598 614
+rect 1756 580 1790 614
+rect 1948 580 1982 614
+rect 1660 270 1694 304
+<< locali >>
+rect 1402 1010 1498 1044
+rect 1532 1010 1566 1044
+rect 1600 1010 1634 1044
+rect 1668 1010 1702 1044
+rect 1736 1010 1770 1044
+rect 1402 948 1436 1010
+rect 1402 880 1436 914
+rect 1402 812 1436 846
+rect 1402 744 1436 778
+rect 1402 676 1436 710
+rect 1516 846 1550 865
+rect 1516 778 1550 780
+rect 1516 742 1550 744
+rect 1516 657 1550 676
+rect 1612 846 1646 1010
+rect 1612 778 1646 812
+rect 1612 710 1646 744
+rect 1612 657 1646 676
+rect 1708 846 1742 865
+rect 1708 778 1742 780
+rect 1708 742 1742 744
+rect 1708 657 1742 676
+rect 1804 846 1838 1044
+rect 1872 1010 1906 1044
+rect 1940 1010 1974 1044
+rect 2008 1010 2042 1044
+rect 2076 1010 2110 1044
+rect 2144 1010 2240 1044
+rect 1804 778 1838 812
+rect 1804 710 1838 744
+rect 1804 657 1838 676
+rect 1900 846 1934 865
+rect 1900 778 1934 780
+rect 1900 742 1934 744
+rect 1900 657 1934 676
+rect 1996 846 2030 1010
+rect 2206 948 2240 1010
+rect 2206 880 2240 914
+rect 1996 778 2030 812
+rect 1996 710 2030 744
+rect 1996 657 2030 676
+rect 2092 846 2126 865
+rect 2092 778 2126 780
+rect 2092 742 2126 744
+rect 2092 657 2126 676
+rect 2206 812 2240 846
+rect 2206 744 2240 778
+rect 2206 676 2240 710
+rect 1402 608 1436 642
+rect 1548 580 1564 614
+rect 1598 580 1614 614
+rect 1740 580 1756 614
+rect 1790 580 1806 614
+rect 1932 580 1948 614
+rect 1982 580 1998 614
+rect 2206 608 2240 642
+rect 1402 512 1436 574
+rect 2206 512 2240 574
+rect 1402 478 1498 512
+rect 1532 478 1566 512
+rect 1600 478 1634 512
+rect 1668 478 1702 512
+rect 1736 478 1770 512
+rect 1804 478 1838 512
+rect 1872 478 1906 512
+rect 1940 478 1974 512
+rect 2008 478 2042 512
+rect 2076 478 2110 512
+rect 2144 478 2240 512
+rect 1402 372 1510 406
+rect 1544 372 1578 406
+rect 1612 372 1646 406
+rect 1680 372 1714 406
+rect 1748 372 1856 406
+rect 1402 285 1436 372
+rect 1644 270 1660 304
+rect 1694 270 1710 304
+rect 1822 285 1856 372
+rect 1402 217 1436 251
+rect 1402 149 1436 183
+rect 1402 81 1436 115
+rect 1402 13 1436 47
+rect 1516 217 1550 236
+rect 1516 149 1550 151
+rect 1516 113 1550 115
+rect 1516 28 1550 47
+rect 1612 217 1646 236
+rect 1612 149 1646 183
+rect 1612 81 1646 115
+rect 1402 -108 1436 -21
+rect 1402 -142 1510 -108
+rect 1544 -142 1578 -108
+rect 1612 -142 1646 47
+rect 1708 217 1742 236
+rect 1708 149 1742 151
+rect 1708 113 1742 115
+rect 1708 28 1742 47
+rect 1822 217 1856 251
+rect 1822 149 1856 183
+rect 1822 81 1856 115
+rect 1822 13 1856 47
+rect 1822 -108 1856 -21
+rect 1680 -142 1714 -108
+rect 1748 -142 1856 -108
+<< viali >>
+rect 1516 812 1550 814
+rect 1516 780 1550 812
+rect 1516 710 1550 742
+rect 1516 708 1550 710
+rect 1708 812 1742 814
+rect 1708 780 1742 812
+rect 1708 710 1742 742
+rect 1708 708 1742 710
+rect 1900 812 1934 814
+rect 1900 780 1934 812
+rect 1900 710 1934 742
+rect 1900 708 1934 710
+rect 2092 812 2126 814
+rect 2092 780 2126 812
+rect 2092 710 2126 742
+rect 2092 708 2126 710
+rect 1564 580 1598 614
+rect 1756 580 1790 614
+rect 1948 580 1982 614
+rect 1660 270 1694 304
+rect 1516 183 1550 185
+rect 1516 151 1550 183
+rect 1516 81 1550 113
+rect 1516 79 1550 81
+rect 1708 183 1742 185
+rect 1708 151 1742 183
+rect 1708 81 1742 113
+rect 1708 79 1742 81
+<< metal1 >>
+rect 1516 861 2126 876
+rect 1510 848 2132 861
+rect 1510 814 1556 848
+rect 1510 780 1516 814
+rect 1550 780 1556 814
+rect 1510 742 1556 780
+rect 1510 708 1516 742
+rect 1550 708 1556 742
+rect 1510 661 1556 708
+rect 1702 814 1748 848
+rect 1702 780 1708 814
+rect 1742 780 1748 814
+rect 1702 742 1748 780
+rect 1702 708 1708 742
+rect 1742 708 1748 742
+rect 1702 661 1748 708
+rect 1894 814 1940 848
+rect 1894 780 1900 814
+rect 1934 780 1940 814
+rect 1894 742 1940 780
+rect 1894 708 1900 742
+rect 1934 708 1940 742
+rect 1894 661 1940 708
+rect 2086 814 2132 848
+rect 2086 780 2092 814
+rect 2126 780 2132 814
+rect 2086 742 2132 780
+rect 2086 708 2092 742
+rect 2126 708 2132 742
+rect 1552 614 1994 620
+rect 1552 580 1564 614
+rect 1598 580 1756 614
+rect 1790 580 1948 614
+rect 1982 580 1994 614
+rect 1552 574 1994 580
+rect 1660 310 1694 574
+rect 2086 512 2132 708
+rect 1822 478 2132 512
+rect 1648 304 1706 310
+rect 1648 270 1660 304
+rect 1694 270 1706 304
+rect 1648 264 1706 270
+rect 1510 185 1556 232
+rect 1510 151 1516 185
+rect 1550 151 1556 185
+rect 1510 113 1556 151
+rect 1510 79 1516 113
+rect 1550 79 1556 113
+rect 1510 44 1556 79
+rect 1702 185 1748 232
+rect 1702 151 1708 185
+rect 1742 151 1748 185
+rect 1702 113 1748 151
+rect 1702 79 1708 113
+rect 1742 79 1748 113
+rect 1702 44 1748 79
+rect 1822 44 1856 478
+rect 1510 32 1856 44
+rect 1516 14 1856 32
+<< labels >>
+rlabel metal1 s 1674 432 1674 432 4 VIN
+port 1 nsew
+rlabel metal1 s 1838 430 1838 430 4 VOUT
+port 2 nsew
+rlabel locali s 2224 1024 2224 1024 4 VDD
+port 3 nsew
+rlabel locali s 1838 -122 1838 -122 4 VSS
+port 4 nsew
+<< end >>
diff --git a/mag/INVandCAP_v1p1.mag b/mag/INVandCAP_v1p1.mag
new file mode 100644
index 0000000..64d24e5
--- /dev/null
+++ b/mag/INVandCAP_v1p1.mag
@@ -0,0 +1,95 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< locali >>
+rect 5018 6437 5118 6470
+rect 5018 6403 5051 6437
+rect 5085 6403 5118 6437
+rect 5018 6370 5118 6403
+rect 4646 5225 4734 5252
+rect 4646 5191 4673 5225
+rect 4707 5191 4734 5225
+rect 4646 5164 4734 5191
+<< viali >>
+rect 5051 6403 5085 6437
+rect 4673 5191 4707 5225
+<< metal1 >>
+rect 5012 6437 5124 6476
+rect 5012 6403 5051 6437
+rect 5085 6403 5124 6437
+rect 5012 6364 5124 6403
+rect 3976 5666 4512 5784
+rect 3976 5640 4144 5666
+rect 3976 5524 4002 5640
+rect 4118 5524 4144 5640
+rect 3976 5498 4144 5524
+rect 4674 5640 5310 5666
+rect 4674 5524 5168 5640
+rect 5284 5524 5310 5640
+rect 4674 5498 5310 5524
+rect 4634 5258 4744 5264
+rect 6862 5258 6968 5264
+rect 4634 5234 6968 5258
+rect 4634 5225 6886 5234
+rect 4634 5191 4673 5225
+rect 4707 5191 6886 5225
+rect 4634 5182 6886 5191
+rect 6938 5182 6968 5234
+rect 4634 5158 6968 5182
+rect 4634 5152 4744 5158
+rect 6862 5152 6968 5158
+<< via1 >>
+rect 4002 5524 4118 5640
+rect 5168 5524 5284 5640
+rect 6886 5182 6938 5234
+<< metal2 >>
+rect 3976 5640 4144 5666
+rect 3976 5524 4002 5640
+rect 4118 5524 4144 5640
+rect 3976 5498 4144 5524
+rect 5138 5650 5314 5670
+rect 5138 5514 5158 5650
+rect 5294 5514 5314 5650
+rect 5138 5494 5314 5514
+rect 6856 5234 6968 5264
+rect 6856 5182 6886 5234
+rect 6938 5182 6968 5234
+rect 6856 5044 6968 5182
+<< via2 >>
+rect 5158 5640 5294 5650
+rect 5158 5524 5168 5640
+rect 5168 5524 5284 5640
+rect 5284 5524 5294 5640
+rect 5158 5514 5294 5524
+<< metal3 >>
+rect 5140 5654 5746 5666
+rect 5140 5650 5590 5654
+rect 5140 5514 5158 5650
+rect 5294 5514 5590 5650
+rect 5140 5510 5590 5514
+rect 5734 5510 5746 5654
+rect 5140 5498 5746 5510
+<< via3 >>
+rect 5590 5510 5734 5654
+<< metal4 >>
+rect 5584 5654 5740 5660
+rect 5584 5510 5590 5654
+rect 5734 5510 5740 5654
+rect 5584 5504 5740 5510
+use INV_v1p1  INV_v1p1_0
+timestamp 1640975112
+transform 1 0 2818 0 1 5366
+box 1366 -168 2276 1080
+use CAPOSC_v1p1  CAPOSC_v1p1_0
+timestamp 1640975112
+transform 1 0 -3068 0 1 432
+box 3068 -432 10032 5306
+<< labels >>
+flabel metal3 s 5220 5580 5220 5580 0 FreeSans 2000 0 0 0 VOUT
+port 1 nsew
+flabel metal1 s 5034 6392 5034 6392 0 FreeSans 2000 0 0 0 VDD
+port 2 nsew
+flabel metal1 s 4984 5204 4984 5204 0 FreeSans 2000 0 0 0 VSS
+port 3 nsew
+<< end >>
diff --git a/mag/OSC_v3p2.mag b/mag/OSC_v3p2.mag
new file mode 100644
index 0000000..752cca9
--- /dev/null
+++ b/mag/OSC_v3p2.mag
@@ -0,0 +1,107 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< locali >>
+rect 19462 5928 19674 6028
+rect 19462 5822 19515 5928
+rect 19621 5822 19674 5928
+rect 20304 5982 20528 6028
+rect 20304 5876 20363 5982
+rect 20469 5876 20528 5982
+rect 20304 5846 20528 5876
+rect 19462 5802 19674 5822
+<< viali >>
+rect 19515 5822 19621 5928
+rect 20363 5876 20469 5982
+<< metal1 >>
+rect 19112 6486 19464 6558
+rect 5000 6374 19464 6486
+rect 19112 6372 19464 6374
+rect 19464 6046 20404 6068
+rect 19464 6044 20092 6046
+rect 19462 5928 19674 5950
+rect 19462 5901 19515 5928
+rect 19621 5901 19674 5928
+rect 19462 5849 19510 5901
+rect 19626 5849 19674 5901
+rect 19462 5822 19515 5849
+rect 19621 5822 19674 5849
+rect 19462 5802 19674 5822
+rect 19776 5270 20092 6044
+rect 20304 5982 20528 6000
+rect 20304 5955 20363 5982
+rect 20469 5955 20528 5982
+rect 20304 5903 20358 5955
+rect 20474 5903 20528 5955
+rect 20304 5876 20363 5903
+rect 20469 5876 20528 5903
+rect 20304 5846 20528 5876
+rect 19776 5268 20404 5270
+rect 4722 5168 20956 5268
+<< via1 >>
+rect 19510 5849 19515 5901
+rect 19515 5849 19562 5901
+rect 19574 5849 19621 5901
+rect 19621 5849 19626 5901
+rect 20358 5903 20363 5955
+rect 20363 5903 20410 5955
+rect 20422 5903 20469 5955
+rect 20469 5903 20474 5955
+<< metal2 >>
+rect 3964 6592 19294 6760
+rect 3964 5508 4132 6592
+rect 5126 5504 11132 5676
+rect 12126 5504 18132 5676
+rect 19126 5504 19294 6592
+rect 20304 5955 20528 6000
+rect 19462 5901 19674 5950
+rect 19462 5849 19510 5901
+rect 19562 5849 19574 5901
+rect 19626 5849 19674 5901
+rect 19462 5802 19674 5849
+rect 20304 5903 20358 5955
+rect 20410 5903 20422 5955
+rect 20474 5903 20528 5955
+rect 20304 5846 20528 5903
+rect 17960 5362 18132 5504
+rect 19502 5362 19674 5802
+rect 17958 5190 19676 5362
+<< metal3 >>
+rect 2840 5002 3000 5162
+rect 9840 5002 10000 5162
+rect 16840 5002 17000 5162
+<< metal5 >>
+rect 392 5582 5856 5902
+rect 7392 5582 12856 5902
+rect 14392 5582 18936 5902
+use INVandCAP_v1p1  INVandCAP_v1p1_2
+timestamp 1640975112
+transform 1 0 13988 0 1 10
+box 0 0 6968 6476
+use INVandCAP_v1p1  INVandCAP_v1p1_1
+timestamp 1640975112
+transform 1 0 6988 0 1 10
+box 0 0 6968 6476
+use INVandCAP_v1p1  INVandCAP_v1p1_0
+timestamp 1640975112
+transform 1 0 -12 0 1 10
+box 0 0 6968 6476
+use BUFFMIN_v1p1  BUFFMIN_v1p1_0
+timestamp 1640975112
+transform 1 0 19494 0 1 5938
+box -30 -10 910 670
+<< labels >>
+flabel metal1 s 5626 6424 5626 6424 0 FreeSans 2000 0 0 0 VDD
+port 1 nsew
+flabel metal1 s 5512 5204 5512 5204 0 FreeSans 2000 0 0 0 VSS
+port 2 nsew
+flabel metal2 s 4048 6666 4048 6666 0 FreeSans 2000 0 0 0 SENS_IN
+port 3 nsew
+flabel metal2 s 7040 5580 7040 5580 0 FreeSans 2000 0 0 0 N1
+port 4 nsew
+flabel metal5 s 16012 5754 16012 5754 0 FreeSans 2000 0 0 0 CON_CV
+port 5 nsew
+flabel locali s 20362 6000 20362 6000 0 FreeSans 2000 0 0 0 N2
+port 6 nsew
+<< end >>
diff --git a/mag/PASSGATE_v1p1.mag b/mag/PASSGATE_v1p1.mag
new file mode 100644
index 0000000..bf0fd68
--- /dev/null
+++ b/mag/PASSGATE_v1p1.mag
@@ -0,0 +1,608 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< error_s >>
+rect 1517 660 1645 661
+rect 1709 660 1837 661
+rect 1901 660 2029 661
+<< nwell >>
+rect 1366 442 2276 1080
+<< pwell >>
+rect 1376 -168 1882 432
+<< nmos >>
+rect 1566 32 1596 232
+rect 1662 32 1692 232
+<< pmos >>
+rect 1566 660 1596 860
+rect 1662 660 1692 860
+rect 1758 660 1788 860
+rect 1854 660 1884 860
+rect 1950 660 1980 860
+rect 2046 660 2076 860
+<< ndiff >>
+rect 1504 217 1566 232
+rect 1504 183 1516 217
+rect 1550 183 1566 217
+rect 1504 149 1566 183
+rect 1504 115 1516 149
+rect 1550 115 1566 149
+rect 1504 81 1566 115
+rect 1504 47 1516 81
+rect 1550 47 1566 81
+rect 1504 32 1566 47
+rect 1596 217 1662 232
+rect 1596 183 1612 217
+rect 1646 183 1662 217
+rect 1596 149 1662 183
+rect 1596 115 1612 149
+rect 1646 115 1662 149
+rect 1596 81 1662 115
+rect 1596 47 1612 81
+rect 1646 47 1662 81
+rect 1596 32 1662 47
+rect 1692 217 1754 232
+rect 1692 183 1708 217
+rect 1742 183 1754 217
+rect 1692 149 1754 183
+rect 1692 115 1708 149
+rect 1742 115 1754 149
+rect 1692 81 1754 115
+rect 1692 47 1708 81
+rect 1742 47 1754 81
+rect 1692 32 1754 47
+<< pdiff >>
+rect 1504 845 1566 860
+rect 1504 811 1516 845
+rect 1550 811 1566 845
+rect 1504 777 1566 811
+rect 1504 743 1516 777
+rect 1550 743 1566 777
+rect 1504 709 1566 743
+rect 1504 675 1516 709
+rect 1550 675 1566 709
+rect 1504 660 1566 675
+rect 1596 845 1662 860
+rect 1596 811 1612 845
+rect 1646 811 1662 845
+rect 1596 777 1662 811
+rect 1596 743 1612 777
+rect 1646 743 1662 777
+rect 1596 709 1662 743
+rect 1596 675 1612 709
+rect 1646 675 1662 709
+rect 1596 660 1662 675
+rect 1692 845 1758 860
+rect 1692 811 1708 845
+rect 1742 811 1758 845
+rect 1692 777 1758 811
+rect 1692 743 1708 777
+rect 1742 743 1758 777
+rect 1692 709 1758 743
+rect 1692 675 1708 709
+rect 1742 675 1758 709
+rect 1692 660 1758 675
+rect 1788 845 1854 860
+rect 1788 811 1804 845
+rect 1838 811 1854 845
+rect 1788 777 1854 811
+rect 1788 743 1804 777
+rect 1838 743 1854 777
+rect 1788 709 1854 743
+rect 1788 675 1804 709
+rect 1838 675 1854 709
+rect 1788 660 1854 675
+rect 1884 845 1950 860
+rect 1884 811 1900 845
+rect 1934 811 1950 845
+rect 1884 777 1950 811
+rect 1884 743 1900 777
+rect 1934 743 1950 777
+rect 1884 709 1950 743
+rect 1884 675 1900 709
+rect 1934 675 1950 709
+rect 1884 660 1950 675
+rect 1980 845 2046 860
+rect 1980 811 1996 845
+rect 2030 811 2046 845
+rect 1980 777 2046 811
+rect 1980 743 1996 777
+rect 2030 743 2046 777
+rect 1980 709 2046 743
+rect 1980 675 1996 709
+rect 2030 675 2046 709
+rect 1980 660 2046 675
+rect 2076 845 2138 860
+rect 2076 811 2092 845
+rect 2126 811 2138 845
+rect 2076 777 2138 811
+rect 2076 743 2092 777
+rect 2126 743 2138 777
+rect 2076 709 2138 743
+rect 2076 675 2092 709
+rect 2126 675 2138 709
+rect 2076 660 2138 675
+<< ndiffc >>
+rect 1516 183 1550 217
+rect 1516 115 1550 149
+rect 1516 47 1550 81
+rect 1612 183 1646 217
+rect 1612 115 1646 149
+rect 1612 47 1646 81
+rect 1708 183 1742 217
+rect 1708 115 1742 149
+rect 1708 47 1742 81
+<< pdiffc >>
+rect 1516 811 1550 845
+rect 1516 743 1550 777
+rect 1516 675 1550 709
+rect 1612 811 1646 845
+rect 1612 743 1646 777
+rect 1612 675 1646 709
+rect 1708 811 1742 845
+rect 1708 743 1742 777
+rect 1708 675 1742 709
+rect 1804 811 1838 845
+rect 1804 743 1838 777
+rect 1804 675 1838 709
+rect 1900 811 1934 845
+rect 1900 743 1934 777
+rect 1900 675 1934 709
+rect 1996 811 2030 845
+rect 1996 743 2030 777
+rect 1996 675 2030 709
+rect 2092 811 2126 845
+rect 2092 743 2126 777
+rect 2092 675 2126 709
+<< psubdiff >>
+rect 1402 372 1510 406
+rect 1544 372 1578 406
+rect 1612 372 1646 406
+rect 1680 372 1714 406
+rect 1748 372 1856 406
+rect 1402 285 1436 372
+rect 1402 217 1436 251
+rect 1822 285 1856 372
+rect 1402 149 1436 183
+rect 1402 81 1436 115
+rect 1402 13 1436 47
+rect 1822 217 1856 251
+rect 1822 149 1856 183
+rect 1822 81 1856 115
+rect 1822 13 1856 47
+rect 1402 -108 1436 -21
+rect 1822 -108 1856 -21
+rect 1402 -142 1510 -108
+rect 1544 -142 1578 -108
+rect 1612 -142 1646 -108
+rect 1680 -142 1714 -108
+rect 1748 -142 1856 -108
+<< nsubdiff >>
+rect 1402 1010 1498 1044
+rect 1532 1010 1566 1044
+rect 1600 1010 1634 1044
+rect 1668 1010 1702 1044
+rect 1736 1010 1770 1044
+rect 1804 1010 1838 1044
+rect 1872 1010 1906 1044
+rect 1940 1010 1974 1044
+rect 2008 1010 2042 1044
+rect 2076 1010 2110 1044
+rect 2144 1010 2240 1044
+rect 1402 948 1436 1010
+rect 2206 948 2240 1010
+rect 1402 880 1436 914
+rect 2206 880 2240 914
+rect 1402 812 1436 846
+rect 1402 744 1436 778
+rect 1402 676 1436 710
+rect 2206 812 2240 846
+rect 2206 744 2240 778
+rect 2206 676 2240 710
+rect 1402 608 1436 642
+rect 1402 512 1436 574
+rect 2206 608 2240 642
+rect 2206 512 2240 574
+rect 1402 478 1498 512
+rect 1532 478 1566 512
+rect 1600 478 1634 512
+rect 1668 478 1702 512
+rect 1736 478 1770 512
+rect 1804 478 1838 512
+rect 1872 478 1906 512
+rect 1940 478 1974 512
+rect 2008 478 2042 512
+rect 2076 478 2110 512
+rect 2144 478 2240 512
+<< psubdiffcont >>
+rect 1510 372 1544 406
+rect 1578 372 1612 406
+rect 1646 372 1680 406
+rect 1714 372 1748 406
+rect 1402 251 1436 285
+rect 1822 251 1856 285
+rect 1402 183 1436 217
+rect 1402 115 1436 149
+rect 1402 47 1436 81
+rect 1822 183 1856 217
+rect 1822 115 1856 149
+rect 1822 47 1856 81
+rect 1402 -21 1436 13
+rect 1822 -21 1856 13
+rect 1510 -142 1544 -108
+rect 1578 -142 1612 -108
+rect 1646 -142 1680 -108
+rect 1714 -142 1748 -108
+<< nsubdiffcont >>
+rect 1498 1010 1532 1044
+rect 1566 1010 1600 1044
+rect 1634 1010 1668 1044
+rect 1702 1010 1736 1044
+rect 1770 1010 1804 1044
+rect 1838 1010 1872 1044
+rect 1906 1010 1940 1044
+rect 1974 1010 2008 1044
+rect 2042 1010 2076 1044
+rect 2110 1010 2144 1044
+rect 1402 914 1436 948
+rect 1402 846 1436 880
+rect 2206 914 2240 948
+rect 1402 778 1436 812
+rect 1402 710 1436 744
+rect 1402 642 1436 676
+rect 2206 846 2240 880
+rect 2206 778 2240 812
+rect 2206 710 2240 744
+rect 1402 574 1436 608
+rect 2206 642 2240 676
+rect 2206 574 2240 608
+rect 1498 478 1532 512
+rect 1566 478 1600 512
+rect 1634 478 1668 512
+rect 1702 478 1736 512
+rect 1770 478 1804 512
+rect 1838 478 1872 512
+rect 1906 478 1940 512
+rect 1974 478 2008 512
+rect 2042 478 2076 512
+rect 2110 478 2144 512
+<< poly >>
+rect 1566 886 2076 916
+rect 1566 860 1596 886
+rect 1662 860 1692 886
+rect 1758 860 1788 886
+rect 1854 860 1884 886
+rect 1950 860 1980 886
+rect 2046 860 2076 886
+rect 1566 636 1596 660
+rect 1662 636 1692 660
+rect 1758 636 1788 660
+rect 1854 636 1884 660
+rect 1950 636 1980 660
+rect 2046 636 2076 660
+rect 1566 630 2076 636
+rect 1548 614 2076 630
+rect 1548 580 1564 614
+rect 1598 606 1756 614
+rect 1598 580 1614 606
+rect 1548 564 1614 580
+rect 1740 580 1756 606
+rect 1790 606 1948 614
+rect 1790 580 1806 606
+rect 1740 564 1806 580
+rect 1932 580 1948 606
+rect 1982 606 2076 614
+rect 1982 580 1998 606
+rect 1932 564 1998 580
+rect 1644 304 1710 320
+rect 1644 284 1660 304
+rect 1566 270 1660 284
+rect 1694 270 1710 304
+rect 1566 254 1710 270
+rect 1566 232 1596 254
+rect 1662 232 1692 254
+rect 1566 10 1596 32
+rect 1662 10 1692 32
+rect 1566 -20 1692 10
+<< polycont >>
+rect 1564 580 1598 614
+rect 1756 580 1790 614
+rect 1948 580 1982 614
+rect 1660 270 1694 304
+<< locali >>
+rect 1402 1010 1498 1044
+rect 1532 1010 1566 1044
+rect 1600 1010 1634 1044
+rect 1668 1010 1702 1044
+rect 1736 1010 1770 1044
+rect 1804 1010 1838 1044
+rect 1872 1010 1906 1044
+rect 1940 1010 1974 1044
+rect 2008 1010 2042 1044
+rect 2076 1010 2110 1044
+rect 2144 1010 2240 1044
+rect 1402 948 1436 1010
+rect 1492 960 1550 976
+rect 1526 926 1550 960
+rect 1402 880 1436 914
+rect 1402 812 1436 846
+rect 1402 744 1436 778
+rect 1402 676 1436 710
+rect 1516 845 1550 926
+rect 1516 777 1550 779
+rect 1516 741 1550 743
+rect 1516 656 1550 675
+rect 1612 960 1646 976
+rect 1646 926 2030 950
+rect 1612 916 2030 926
+rect 1612 845 1646 916
+rect 1612 777 1646 811
+rect 1612 709 1646 743
+rect 1612 656 1646 675
+rect 1708 845 1742 864
+rect 1708 777 1742 779
+rect 1708 741 1742 743
+rect 1708 656 1742 675
+rect 1804 845 1838 916
+rect 1804 777 1838 811
+rect 1804 709 1838 743
+rect 1804 656 1838 675
+rect 1900 845 1934 864
+rect 1900 777 1934 779
+rect 1900 741 1934 743
+rect 1900 656 1934 675
+rect 1996 845 2030 916
+rect 2206 948 2240 1010
+rect 2206 880 2240 914
+rect 1996 777 2030 811
+rect 1996 709 2030 743
+rect 1996 656 2030 675
+rect 2092 845 2126 864
+rect 2092 777 2126 779
+rect 2092 741 2126 743
+rect 2092 656 2126 675
+rect 2206 812 2240 846
+rect 2206 744 2240 778
+rect 2206 676 2240 710
+rect 1402 608 1436 642
+rect 2240 642 2326 672
+rect 1548 580 1564 614
+rect 1598 580 1614 614
+rect 1740 580 1756 614
+rect 1790 580 1806 614
+rect 1932 580 1948 614
+rect 1982 580 1998 614
+rect 2206 608 2326 642
+rect 1402 512 1436 574
+rect 2240 574 2326 608
+rect 2206 512 2326 574
+rect 1402 478 1498 512
+rect 1532 478 1566 512
+rect 1600 478 1634 512
+rect 1668 478 1702 512
+rect 1736 478 1770 512
+rect 1804 478 1838 512
+rect 1872 478 1906 512
+rect 1940 478 1974 512
+rect 2008 478 2042 512
+rect 2076 478 2110 512
+rect 2144 492 2326 512
+rect 2144 478 2240 492
+rect 1402 372 1510 406
+rect 1544 372 1578 406
+rect 1612 372 1646 406
+rect 1680 372 1714 406
+rect 1748 372 1856 406
+rect 1402 285 1436 372
+rect 1822 362 1856 372
+rect 1644 270 1660 304
+rect 1694 270 1710 304
+rect 1822 285 2326 362
+rect 1402 217 1436 251
+rect 1856 251 2326 285
+rect 1402 149 1436 183
+rect 1402 81 1436 115
+rect 1402 13 1436 47
+rect 1402 -108 1436 -21
+rect 1516 217 1550 236
+rect 1516 149 1550 151
+rect 1516 113 1550 115
+rect 1516 -22 1550 47
+rect 1492 -38 1550 -22
+rect 1526 -72 1550 -38
+rect 1612 217 1646 236
+rect 1612 149 1646 183
+rect 1612 81 1646 115
+rect 1612 -38 1646 47
+rect 1708 217 1742 236
+rect 1708 149 1742 151
+rect 1708 113 1742 115
+rect 1708 28 1742 47
+rect 1822 217 2326 251
+rect 1856 183 2326 217
+rect 1822 182 2326 183
+rect 1822 149 1856 182
+rect 2706 134 2760 142
+rect 1822 81 1856 115
+rect 2706 100 2714 134
+rect 2748 100 2760 134
+rect 2706 92 2760 100
+rect 1822 13 1856 47
+rect 1822 -108 1856 -21
+rect 1402 -142 1510 -108
+rect 1544 -142 1578 -108
+rect 1612 -142 1646 -108
+rect 1680 -142 1714 -108
+rect 1748 -142 1856 -108
+<< viali >>
+rect 1492 926 1526 960
+rect 1516 811 1550 813
+rect 1516 779 1550 811
+rect 1516 709 1550 741
+rect 1516 707 1550 709
+rect 1612 926 1646 960
+rect 1708 811 1742 813
+rect 1708 779 1742 811
+rect 1708 709 1742 741
+rect 1708 707 1742 709
+rect 1900 811 1934 813
+rect 1900 779 1934 811
+rect 1900 709 1934 741
+rect 1900 707 1934 709
+rect 2092 811 2126 813
+rect 2092 779 2126 811
+rect 2092 709 2126 741
+rect 2092 707 2126 709
+rect 1564 580 1598 614
+rect 1756 580 1790 614
+rect 1948 580 1982 614
+rect 1660 270 1694 304
+rect 1516 183 1550 185
+rect 1516 151 1550 183
+rect 1516 81 1550 113
+rect 1516 79 1550 81
+rect 1492 -72 1526 -38
+rect 1708 183 1742 185
+rect 1708 151 1742 183
+rect 1708 81 1742 113
+rect 1708 79 1742 81
+rect 2284 100 2318 134
+rect 2714 100 2748 134
+rect 1612 -72 1646 -38
+<< metal1 >>
+rect 1476 969 1542 976
+rect 1476 917 1483 969
+rect 1535 917 1542 969
+rect 1476 910 1542 917
+rect 1596 969 1662 976
+rect 1596 917 1603 969
+rect 1655 917 1662 969
+rect 1596 910 1662 917
+rect 1516 860 2126 876
+rect 1510 848 2132 860
+rect 1510 813 1556 848
+rect 1510 779 1516 813
+rect 1550 779 1556 813
+rect 1510 741 1556 779
+rect 1510 707 1516 741
+rect 1550 707 1556 741
+rect 1510 660 1556 707
+rect 1702 813 1748 848
+rect 1702 779 1708 813
+rect 1742 779 1748 813
+rect 1702 741 1748 779
+rect 1702 707 1708 741
+rect 1742 707 1748 741
+rect 1702 660 1748 707
+rect 1894 813 1940 848
+rect 1894 779 1900 813
+rect 1934 779 1940 813
+rect 1894 741 1940 779
+rect 1894 707 1900 741
+rect 1934 707 1940 741
+rect 1894 660 1940 707
+rect 2086 813 2132 848
+rect 2086 779 2092 813
+rect 2126 779 2132 813
+rect 2086 741 2132 779
+rect 2086 707 2092 741
+rect 2126 707 2132 741
+rect 2086 660 2132 707
+rect 1552 614 2052 620
+rect 1552 580 1564 614
+rect 1598 580 1756 614
+rect 1790 580 1948 614
+rect 1982 580 2052 614
+rect 1552 574 2052 580
+rect 1994 452 2052 574
+rect 1994 394 2882 452
+rect 1644 304 2110 320
+rect 1644 270 1660 304
+rect 1694 270 2110 304
+rect 1644 262 2110 270
+rect 1510 185 1556 232
+rect 1510 151 1516 185
+rect 1550 151 1556 185
+rect 1510 113 1556 151
+rect 1510 79 1516 113
+rect 1550 79 1556 113
+rect 1510 44 1556 79
+rect 1702 185 1748 232
+rect 1702 151 1708 185
+rect 1742 151 1748 185
+rect 1702 113 1748 151
+rect 1702 79 1708 113
+rect 1742 79 1748 113
+rect 2052 146 2110 262
+rect 2824 146 2882 394
+rect 2052 134 2330 146
+rect 2052 100 2284 134
+rect 2318 100 2330 134
+rect 2052 88 2330 100
+rect 2702 134 2882 146
+rect 2702 100 2714 134
+rect 2748 100 2882 134
+rect 2702 86 2882 100
+rect 1702 44 1748 79
+rect 1510 32 1792 44
+rect 1516 14 1792 32
+rect 1476 -29 1542 -22
+rect 1476 -81 1483 -29
+rect 1535 -81 1542 -29
+rect 1476 -88 1542 -81
+rect 1596 -29 1662 -22
+rect 1596 -81 1603 -29
+rect 1655 -81 1662 -29
+rect 1596 -88 1662 -81
+<< via1 >>
+rect 1483 960 1535 969
+rect 1483 926 1492 960
+rect 1492 926 1526 960
+rect 1526 926 1535 960
+rect 1483 917 1535 926
+rect 1603 960 1655 969
+rect 1603 926 1612 960
+rect 1612 926 1646 960
+rect 1646 926 1655 960
+rect 1603 917 1655 926
+rect 1483 -38 1535 -29
+rect 1483 -72 1492 -38
+rect 1492 -72 1526 -38
+rect 1526 -72 1535 -38
+rect 1483 -81 1535 -72
+rect 1603 -38 1655 -29
+rect 1603 -72 1612 -38
+rect 1612 -72 1646 -38
+rect 1646 -72 1655 -38
+rect 1603 -81 1655 -72
+<< metal2 >>
+rect 1476 969 1544 976
+rect 1476 917 1483 969
+rect 1535 917 1544 969
+rect 1476 -29 1544 917
+rect 1476 -81 1483 -29
+rect 1535 -81 1544 -29
+rect 1476 -88 1544 -81
+rect 1596 969 1662 976
+rect 1596 917 1603 969
+rect 1655 917 1662 969
+rect 1596 -29 1662 917
+rect 1596 -81 1603 -29
+rect 1655 -81 1662 -29
+rect 1596 -88 1662 -81
+use INVMIN_v1p1  INVMIN_v1p1_0
+timestamp 1640975112
+transform 1 0 2576 0 1 192
+box -300 -150 170 530
+<< labels >>
+flabel metal2 s 1508 940 1508 940 0 FreeSans 600 0 0 0 VIN
+port 1 nsew
+flabel metal2 s 1632 -54 1632 -54 0 FreeSans 600 0 0 0 VOUT
+port 2 nsew
+flabel metal1 s 1766 288 1766 288 0 FreeSans 600 0 0 0 CTR
+port 3 nsew
+flabel locali s 2296 588 2296 588 0 FreeSans 600 0 0 0 VDD
+port 4 nsew
+flabel locali s 2206 272 2206 272 0 FreeSans 600 0 0 0 VSS
+port 5 nsew
+<< end >>
diff --git a/mag/SDC_v1p2.mag b/mag/SDC_v1p2.mag
new file mode 100644
index 0000000..3debc86
--- /dev/null
+++ b/mag/SDC_v1p2.mag
@@ -0,0 +1,354 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< error_s >>
+rect 22866 7800 23094 7827
+rect 22894 7772 23094 7799
+rect 22814 7701 22848 7765
+rect 23079 7749 23094 7763
+rect 23224 7749 23239 7763
+rect 22864 7747 23094 7749
+rect 23194 7748 23450 7749
+rect 23224 7747 23450 7748
+rect 23079 7703 23094 7719
+rect 23224 7703 23239 7719
+rect 22894 7667 23094 7694
+rect 22894 7639 23094 7666
+rect 22894 7600 23094 7627
+rect 23224 7600 23451 7627
+rect 22894 7572 23094 7599
+rect 23225 7572 23423 7599
+rect 22814 7501 22848 7565
+rect 22864 7547 23120 7549
+rect 23199 7547 23445 7549
+rect 23098 7506 23132 7507
+rect 23461 7501 23495 7565
+rect 23225 7467 23423 7494
+rect 23224 7439 23424 7466
+rect 23224 7400 23424 7427
+rect 23225 7372 23423 7399
+rect 23199 7347 23445 7349
+rect 23461 7301 23495 7365
+rect 23225 7267 23423 7294
+rect 20885 7246 21013 7247
+rect 21077 7246 21205 7247
+rect 21269 7246 21397 7247
+rect 23224 7239 23424 7266
+rect 23196 7227 23252 7228
+rect 22856 7214 22928 7227
+rect 22890 7194 22928 7214
+rect 23196 7200 23424 7227
+rect 23196 7199 23224 7200
+rect 22814 7101 22848 7165
+rect 22890 7160 22962 7193
+rect 23196 7172 23424 7199
+rect 22864 7148 23150 7149
+rect 23168 7148 23450 7149
+rect 22864 7147 23120 7148
+rect 23198 7147 23450 7148
+rect 22894 7067 23094 7094
+rect 23224 7067 23424 7094
+rect 22894 7039 23094 7066
+rect 23224 7039 23424 7066
+rect 22894 7000 23094 7027
+rect 23224 7000 23424 7027
+rect 22894 6972 23094 6999
+rect 23224 6972 23424 6999
+rect 22864 6948 23150 6949
+rect 23168 6948 23450 6949
+rect 22864 6947 23120 6948
+rect 23198 6947 23450 6948
+rect 22894 6867 22960 6894
+rect 23196 6867 23424 6894
+rect 23196 6866 23252 6867
+rect 22894 6846 22932 6866
+rect 22866 6839 22932 6846
+rect 23224 6839 23424 6866
+rect 23224 6838 23252 6839
+rect 23224 6800 23424 6827
+rect 23225 6772 23423 6799
+rect 23199 6747 23445 6749
+rect 23461 6701 23495 6765
+rect 23225 6667 23423 6694
+rect 23224 6639 23424 6666
+rect 23224 6600 23424 6627
+rect 23225 6572 23423 6599
+rect 22814 6501 22848 6565
+rect 22864 6547 23120 6549
+rect 23199 6547 23445 6549
+rect 23461 6501 23495 6565
+rect 22894 6467 23094 6494
+rect 23225 6467 23423 6494
+rect 22894 6439 23094 6466
+rect 23224 6439 23451 6466
+rect 22894 6400 23094 6427
+rect 22894 6372 23094 6399
+rect 23079 6349 23094 6363
+rect 23224 6349 23239 6363
+rect 22864 6347 23094 6349
+rect 23194 6348 23450 6349
+rect 23224 6347 23450 6348
+rect 23079 6303 23094 6319
+rect 23224 6303 23239 6319
+rect 22894 6267 23094 6294
+rect 22866 6239 23094 6266
+<< nwell >>
+rect 20800 8076 20998 8234
+rect 20734 7666 21644 8076
+<< locali >>
+rect 20866 7630 20884 7664
+rect 20918 7630 20956 7664
+rect 20990 7630 21028 7664
+rect 21062 7630 21100 7664
+rect 21134 7630 21172 7664
+rect 21206 7630 21244 7664
+rect 21278 7630 21316 7664
+rect 21350 7630 21388 7664
+rect 21422 7630 21460 7664
+rect 21494 7630 21512 7664
+rect 22756 7307 22816 7320
+rect 22756 7273 22769 7307
+rect 22803 7273 22816 7307
+rect 22756 7260 22816 7273
+rect 21874 6615 21934 6628
+rect 21874 6581 21887 6615
+rect 21921 6581 21934 6615
+rect 21874 6568 21934 6581
+rect 21224 6491 21284 6504
+rect 21224 6457 21237 6491
+rect 21271 6457 21284 6491
+rect 21224 6444 21284 6457
+<< viali >>
+rect 20884 7630 20918 7664
+rect 20956 7630 20990 7664
+rect 21028 7630 21062 7664
+rect 21100 7630 21134 7664
+rect 21172 7630 21206 7664
+rect 21244 7630 21278 7664
+rect 21316 7630 21350 7664
+rect 21388 7630 21422 7664
+rect 21460 7630 21494 7664
+rect 22769 7273 22803 7307
+rect 21887 6581 21921 6615
+rect 21237 6457 21271 6491
+<< metal1 >>
+rect 7826 9164 7920 9222
+rect 22668 9130 23616 9242
+rect 7778 7942 7862 7996
+rect 20866 7676 21514 7848
+rect 22122 7806 22774 8026
+rect 20858 7664 21522 7676
+rect 20858 7630 20884 7664
+rect 20918 7630 20956 7664
+rect 20990 7630 21028 7664
+rect 21062 7630 21100 7664
+rect 21134 7630 21172 7664
+rect 21206 7630 21244 7664
+rect 21278 7630 21316 7664
+rect 21350 7630 21388 7664
+rect 21422 7630 21460 7664
+rect 21494 7630 21522 7664
+rect 20858 7616 21522 7630
+rect 23558 7564 23616 9130
+rect 22744 7316 22828 7332
+rect 22744 7264 22760 7316
+rect 22812 7264 22828 7316
+rect 22744 7248 22828 7264
+rect 21862 6624 21946 6640
+rect 21862 6572 21878 6624
+rect 21930 6572 21946 6624
+rect 21862 6556 21946 6572
+rect 21212 6500 21298 6518
+rect 21212 6448 21228 6500
+rect 21280 6448 21298 6500
+rect 21212 6430 21298 6448
+rect 22122 6004 22774 6224
+rect 23528 5874 23616 6444
+rect 22106 5860 23616 5874
+rect 22106 5808 22186 5860
+rect 22238 5808 23616 5860
+rect 22106 5794 23616 5808
+<< via1 >>
+rect 22760 7307 22812 7316
+rect 22760 7273 22769 7307
+rect 22769 7273 22803 7307
+rect 22803 7273 22812 7307
+rect 22760 7264 22812 7273
+rect 21878 6615 21930 6624
+rect 21878 6581 21887 6615
+rect 21887 6581 21921 6615
+rect 21921 6581 21930 6615
+rect 21878 6572 21930 6581
+rect 21228 6491 21280 6500
+rect 21228 6457 21237 6491
+rect 21237 6457 21271 6491
+rect 21271 6457 21280 6491
+rect 21228 6448 21280 6457
+rect 22186 5808 22238 5860
+<< metal2 >>
+rect 9142 7660 9374 7780
+rect 22022 7756 22246 8434
+rect 22022 7692 22854 7756
+rect 20790 7562 20912 7644
+rect 20998 7513 21102 7562
+rect 20998 7457 21021 7513
+rect 21077 7457 21102 7513
+rect 20998 7433 21102 7457
+rect 20998 7377 21021 7433
+rect 21077 7377 21102 7433
+rect 20998 7353 21102 7377
+rect 20998 7297 21021 7353
+rect 21077 7297 21102 7353
+rect 20998 7273 21102 7297
+rect 20998 7217 21021 7273
+rect 21077 7217 21102 7273
+rect 20998 7193 21102 7217
+rect 20998 7137 21021 7193
+rect 21077 7137 21102 7193
+rect 20998 7113 21102 7137
+rect 20998 7057 21021 7113
+rect 21077 7057 21102 7113
+rect 20998 7046 21102 7057
+rect 22402 7316 22822 7328
+rect 22402 7264 22760 7316
+rect 22812 7264 22822 7316
+rect 22402 7254 22822 7264
+rect 22402 6636 22476 7254
+rect 21868 6624 22476 6636
+rect 21868 6572 21878 6624
+rect 21930 6572 22476 6624
+rect 21868 6562 22476 6572
+rect 21218 6500 22248 6510
+rect 21218 6448 21228 6500
+rect 21280 6448 22248 6500
+rect 21218 6438 22248 6448
+rect 22176 5860 22248 6438
+rect 22176 5808 22186 5860
+rect 22238 5808 22248 5860
+rect 22176 5798 22248 5808
+rect 22994 5626 23062 6528
+rect 22220 5472 23062 5626
+<< via2 >>
+rect 21021 7457 21077 7513
+rect 21021 7377 21077 7433
+rect 21021 7297 21077 7353
+rect 21021 7217 21077 7273
+rect 21021 7137 21077 7193
+rect 21021 7057 21077 7113
+<< metal3 >>
+rect 20998 7513 21102 7562
+rect 20998 7477 21021 7513
+rect 21077 7477 21102 7513
+rect 20998 7413 21017 7477
+rect 21081 7413 21102 7477
+rect 20998 7397 21021 7413
+rect 21077 7397 21102 7413
+rect 20998 7333 21017 7397
+rect 21081 7333 21102 7397
+rect 20998 7317 21021 7333
+rect 21077 7317 21102 7333
+rect 20998 7253 21017 7317
+rect 21081 7253 21102 7317
+rect 20998 7237 21021 7253
+rect 21077 7237 21102 7253
+rect 20998 7173 21017 7237
+rect 21081 7173 21102 7237
+rect 20998 7157 21021 7173
+rect 21077 7157 21102 7173
+rect 20998 7093 21017 7157
+rect 21081 7093 21102 7157
+rect 20998 7057 21021 7093
+rect 21077 7057 21102 7093
+rect 20998 7046 21102 7057
+<< via3 >>
+rect 21017 7457 21021 7477
+rect 21021 7457 21077 7477
+rect 21077 7457 21081 7477
+rect 21017 7433 21081 7457
+rect 21017 7413 21021 7433
+rect 21021 7413 21077 7433
+rect 21077 7413 21081 7433
+rect 21017 7377 21021 7397
+rect 21021 7377 21077 7397
+rect 21077 7377 21081 7397
+rect 21017 7353 21081 7377
+rect 21017 7333 21021 7353
+rect 21021 7333 21077 7353
+rect 21077 7333 21081 7353
+rect 21017 7297 21021 7317
+rect 21021 7297 21077 7317
+rect 21077 7297 21081 7317
+rect 21017 7273 21081 7297
+rect 21017 7253 21021 7273
+rect 21021 7253 21077 7273
+rect 21077 7253 21081 7273
+rect 21017 7217 21021 7237
+rect 21021 7217 21077 7237
+rect 21077 7217 21081 7237
+rect 21017 7193 21081 7217
+rect 21017 7173 21021 7193
+rect 21021 7173 21077 7193
+rect 21077 7173 21081 7193
+rect 21017 7137 21021 7157
+rect 21021 7137 21077 7157
+rect 21077 7137 21081 7157
+rect 21017 7113 21081 7137
+rect 21017 7093 21021 7113
+rect 21021 7093 21077 7113
+rect 21077 7093 21081 7113
+<< metal4 >>
+rect 20620 8356 21102 8502
+rect 20420 8320 21102 8356
+rect 20998 7477 21102 8320
+rect 20998 7413 21017 7477
+rect 21081 7413 21102 7477
+rect 20998 7397 21102 7413
+rect 20998 7333 21017 7397
+rect 21081 7333 21102 7397
+rect 20998 7317 21102 7333
+rect 20998 7253 21017 7317
+rect 21081 7253 21102 7317
+rect 20998 7237 21102 7253
+rect 20998 7173 21017 7237
+rect 21081 7173 21102 7237
+rect 20998 7157 21102 7173
+rect 20998 7093 21017 7157
+rect 21081 7093 21102 7157
+rect 20998 7046 21102 7093
+<< via4 >>
+rect 20384 8356 20620 8592
+<< metal5 >>
+rect 20280 8592 20514 8676
+rect 20280 8356 20384 8592
+rect 20620 8356 20654 8504
+rect 20280 8320 20654 8356
+rect 20654 5208 21574 5528
+use OSC_v3p2  OSC_v3p2_1
+timestamp 1640975112
+transform 1 0 1718 0 -1 14404
+box -12 10 20956 6760
+use OSC_v3p2  OSC_v3p2_0
+timestamp 1640975112
+transform 1 0 1718 0 1 -374
+box -12 10 20956 6760
+use DFF_v3p1  DFF_v3p1_0
+timestamp 1640975112
+transform 0 -1 23450 1 0 6860
+box -678 -204 986 904
+use PASSGATE_v1p1  PASSGATE_v1p1_0
+timestamp 1640975112
+transform 1 0 19368 0 1 6586
+box 1366 -168 2882 1080
+<< labels >>
+flabel metal1 s 7808 7968 7808 7968 0 FreeSans 2000 0 0 0 VDD
+port 1 nsew
+flabel metal1 s 7874 9190 7874 9190 0 FreeSans 2000 0 0 0 VSS
+port 2 nsew
+flabel metal2 s 9244 7732 9244 7732 0 FreeSans 2000 0 0 0 SENS_IN
+port 3 nsew
+flabel metal5 s 20956 5398 20956 5398 0 FreeSans 2000 0 0 0 REF_IN
+port 4 nsew
+flabel metal2 s 22458 7288 22458 7288 0 FreeSans 2000 0 0 0 DOUT
+port 5 nsew
+<< end >>
diff --git a/mag/invmin_magic_v1p1.mag b/mag/invmin_magic_v1p1.mag
new file mode 100644
index 0000000..71d5fa1
--- /dev/null
+++ b/mag/invmin_magic_v1p1.mag
@@ -0,0 +1,171 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< nwell >>
+rect -300 250 170 530
+<< pwell >>
+rect -286 -46 156 206
+<< nmos >>
+rect -20 -20 10 180
+<< pmos >>
+rect -20 290 10 490
+<< ndiff >>
+rect -140 131 -20 180
+rect -140 97 -97 131
+rect -63 97 -20 131
+rect -140 63 -20 97
+rect -140 29 -97 63
+rect -63 29 -20 63
+rect -140 -20 -20 29
+rect 10 131 130 180
+rect 10 97 53 131
+rect 87 97 130 131
+rect 10 63 130 97
+rect 10 29 53 63
+rect 87 29 130 63
+rect 10 -20 130 29
+<< pdiff >>
+rect -140 441 -20 490
+rect -140 407 -97 441
+rect -63 407 -20 441
+rect -140 373 -20 407
+rect -140 339 -97 373
+rect -63 339 -20 373
+rect -140 290 -20 339
+rect 10 441 130 490
+rect 10 407 53 441
+rect 87 407 130 441
+rect 10 373 130 407
+rect 10 339 53 373
+rect 87 339 130 373
+rect 10 290 130 339
+<< ndiffc >>
+rect -97 97 -63 131
+rect -97 29 -63 63
+rect 53 97 87 131
+rect 53 29 87 63
+<< pdiffc >>
+rect -97 407 -63 441
+rect -97 339 -63 373
+rect 53 407 87 441
+rect 53 339 87 373
+<< psubdiff >>
+rect -260 131 -140 180
+rect -260 97 -217 131
+rect -183 97 -140 131
+rect -260 63 -140 97
+rect -260 29 -217 63
+rect -183 29 -140 63
+rect -260 -20 -140 29
+<< nsubdiff >>
+rect -260 441 -140 490
+rect -260 407 -217 441
+rect -183 407 -140 441
+rect -260 373 -140 407
+rect -260 339 -217 373
+rect -183 339 -140 373
+rect -260 290 -140 339
+<< psubdiffcont >>
+rect -217 97 -183 131
+rect -217 29 -183 63
+<< nsubdiffcont >>
+rect -217 407 -183 441
+rect -217 339 -183 373
+<< poly >>
+rect -20 490 10 520
+rect -20 180 10 290
+rect -20 -50 10 -20
+rect -90 -83 10 -50
+rect -90 -117 -57 -83
+rect -23 -117 10 -83
+rect -90 -150 10 -117
+<< polycont >>
+rect -57 -117 -23 -83
+<< locali >>
+rect -250 443 -30 480
+rect -250 407 -217 443
+rect -183 407 -97 443
+rect -63 407 -30 443
+rect -250 373 -30 407
+rect -250 337 -217 373
+rect -183 337 -97 373
+rect -63 337 -30 373
+rect -250 300 -30 337
+rect 20 441 120 480
+rect 20 407 53 441
+rect 87 407 120 441
+rect 20 373 120 407
+rect 20 339 53 373
+rect 87 339 120 373
+rect 20 300 120 339
+rect 70 170 120 300
+rect -250 133 -30 170
+rect -250 97 -217 133
+rect -183 97 -97 133
+rect -63 97 -30 133
+rect -250 63 -30 97
+rect -250 27 -217 63
+rect -183 27 -97 63
+rect -63 27 -30 63
+rect -250 -10 -30 27
+rect 20 131 120 170
+rect 20 97 53 131
+rect 87 97 120 131
+rect 20 63 120 97
+rect 20 29 53 63
+rect 87 29 120 63
+rect 20 -10 120 29
+rect 70 -50 120 -10
+rect -300 -83 10 -50
+rect -300 -100 -57 -83
+rect -90 -117 -57 -100
+rect -23 -117 10 -83
+rect 70 -100 170 -50
+rect -90 -150 10 -117
+<< viali >>
+rect -217 441 -183 443
+rect -217 409 -183 441
+rect -97 441 -63 443
+rect -97 409 -63 441
+rect -217 339 -183 371
+rect -217 337 -183 339
+rect -97 339 -63 371
+rect -97 337 -63 339
+rect -217 131 -183 133
+rect -217 99 -183 131
+rect -97 131 -63 133
+rect -97 99 -63 131
+rect -217 29 -183 61
+rect -217 27 -183 29
+rect -97 29 -63 61
+rect -97 27 -63 29
+<< metal1 >>
+rect -300 443 170 480
+rect -300 409 -217 443
+rect -183 409 -97 443
+rect -63 409 170 443
+rect -300 371 170 409
+rect -300 337 -217 371
+rect -183 337 -97 371
+rect -63 337 170 371
+rect -300 300 170 337
+rect -300 133 170 170
+rect -300 99 -217 133
+rect -183 99 -97 133
+rect -63 99 170 133
+rect -300 61 170 99
+rect -300 27 -217 61
+rect -183 27 -97 61
+rect -63 27 170 61
+rect -300 -10 170 27
+<< labels >>
+rlabel locali s -300 -80 -300 -80 4 VIN
+port 1 nsew
+rlabel locali s 170 -80 170 -80 4 VOUT
+port 2 nsew
+rlabel metal1 s -300 390 -300 390 4 VDD
+port 3 nsew
+rlabel metal1 s -300 80 -300 80 4 VSS
+port 4 nsew
+<< end >>
diff --git a/mag/sky130_fd_pr__cap_mim_m3_1_9K4XRG.mag b/mag/sky130_fd_pr__cap_mim_m3_1_9K4XRG.mag
new file mode 100644
index 0000000..8e5cb85
--- /dev/null
+++ b/mag/sky130_fd_pr__cap_mim_m3_1_9K4XRG.mag
@@ -0,0 +1,422 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< metal3 >>
+rect -456 2272 456 2320
+rect -456 2208 372 2272
+rect 436 2208 456 2272
+rect -456 2192 456 2208
+rect -456 2128 372 2192
+rect 436 2128 456 2192
+rect -456 2112 456 2128
+rect -456 2048 372 2112
+rect 436 2048 456 2112
+rect -456 2032 456 2048
+rect -456 1968 372 2032
+rect 436 1968 456 2032
+rect -456 1952 456 1968
+rect -456 1888 372 1952
+rect 436 1888 456 1952
+rect -456 1872 456 1888
+rect -456 1808 372 1872
+rect 436 1808 456 1872
+rect -456 1792 456 1808
+rect -456 1728 372 1792
+rect 436 1728 456 1792
+rect -456 1712 456 1728
+rect -456 1648 372 1712
+rect 436 1648 456 1712
+rect -456 1632 456 1648
+rect -456 1568 372 1632
+rect 436 1568 456 1632
+rect -456 1552 456 1568
+rect -456 1488 372 1552
+rect 436 1488 456 1552
+rect -456 1472 456 1488
+rect -456 1408 372 1472
+rect 436 1408 456 1472
+rect -456 1392 456 1408
+rect -456 1328 372 1392
+rect 436 1328 456 1392
+rect -456 1312 456 1328
+rect -456 1248 372 1312
+rect 436 1248 456 1312
+rect -456 1232 456 1248
+rect -456 1168 372 1232
+rect 436 1168 456 1232
+rect -456 1152 456 1168
+rect -456 1088 372 1152
+rect 436 1088 456 1152
+rect -456 1072 456 1088
+rect -456 1008 372 1072
+rect 436 1008 456 1072
+rect -456 992 456 1008
+rect -456 928 372 992
+rect 436 928 456 992
+rect -456 912 456 928
+rect -456 848 372 912
+rect 436 848 456 912
+rect -456 832 456 848
+rect -456 768 372 832
+rect 436 768 456 832
+rect -456 752 456 768
+rect -456 688 372 752
+rect 436 688 456 752
+rect -456 672 456 688
+rect -456 608 372 672
+rect 436 608 456 672
+rect -456 592 456 608
+rect -456 528 372 592
+rect 436 528 456 592
+rect -456 512 456 528
+rect -456 448 372 512
+rect 436 448 456 512
+rect -456 432 456 448
+rect -456 368 372 432
+rect 436 368 456 432
+rect -456 352 456 368
+rect -456 288 372 352
+rect 436 288 456 352
+rect -456 272 456 288
+rect -456 208 372 272
+rect 436 208 456 272
+rect -456 192 456 208
+rect -456 128 372 192
+rect 436 128 456 192
+rect -456 112 456 128
+rect -456 48 372 112
+rect 436 48 456 112
+rect -456 32 456 48
+rect -456 -32 372 32
+rect 436 -32 456 32
+rect -456 -48 456 -32
+rect -456 -112 372 -48
+rect 436 -112 456 -48
+rect -456 -128 456 -112
+rect -456 -192 372 -128
+rect 436 -192 456 -128
+rect -456 -208 456 -192
+rect -456 -272 372 -208
+rect 436 -272 456 -208
+rect -456 -288 456 -272
+rect -456 -352 372 -288
+rect 436 -352 456 -288
+rect -456 -368 456 -352
+rect -456 -432 372 -368
+rect 436 -432 456 -368
+rect -456 -448 456 -432
+rect -456 -512 372 -448
+rect 436 -512 456 -448
+rect -456 -528 456 -512
+rect -456 -592 372 -528
+rect 436 -592 456 -528
+rect -456 -608 456 -592
+rect -456 -672 372 -608
+rect 436 -672 456 -608
+rect -456 -688 456 -672
+rect -456 -752 372 -688
+rect 436 -752 456 -688
+rect -456 -768 456 -752
+rect -456 -832 372 -768
+rect 436 -832 456 -768
+rect -456 -848 456 -832
+rect -456 -912 372 -848
+rect 436 -912 456 -848
+rect -456 -928 456 -912
+rect -456 -992 372 -928
+rect 436 -992 456 -928
+rect -456 -1008 456 -992
+rect -456 -1072 372 -1008
+rect 436 -1072 456 -1008
+rect -456 -1088 456 -1072
+rect -456 -1152 372 -1088
+rect 436 -1152 456 -1088
+rect -456 -1168 456 -1152
+rect -456 -1232 372 -1168
+rect 436 -1232 456 -1168
+rect -456 -1248 456 -1232
+rect -456 -1312 372 -1248
+rect 436 -1312 456 -1248
+rect -456 -1328 456 -1312
+rect -456 -1392 372 -1328
+rect 436 -1392 456 -1328
+rect -456 -1408 456 -1392
+rect -456 -1472 372 -1408
+rect 436 -1472 456 -1408
+rect -456 -1488 456 -1472
+rect -456 -1552 372 -1488
+rect 436 -1552 456 -1488
+rect -456 -1568 456 -1552
+rect -456 -1632 372 -1568
+rect 436 -1632 456 -1568
+rect -456 -1648 456 -1632
+rect -456 -1712 372 -1648
+rect 436 -1712 456 -1648
+rect -456 -1728 456 -1712
+rect -456 -1792 372 -1728
+rect 436 -1792 456 -1728
+rect -456 -1808 456 -1792
+rect -456 -1872 372 -1808
+rect 436 -1872 456 -1808
+rect -456 -1888 456 -1872
+rect -456 -1952 372 -1888
+rect 436 -1952 456 -1888
+rect -456 -1968 456 -1952
+rect -456 -2032 372 -1968
+rect 436 -2032 456 -1968
+rect -456 -2048 456 -2032
+rect -456 -2112 372 -2048
+rect 436 -2112 456 -2048
+rect -456 -2128 456 -2112
+rect -456 -2192 372 -2128
+rect 436 -2192 456 -2128
+rect -456 -2208 456 -2192
+rect -456 -2272 372 -2208
+rect 436 -2272 456 -2208
+rect -456 -2320 456 -2272
+<< via3 >>
+rect 372 2208 436 2272
+rect 372 2128 436 2192
+rect 372 2048 436 2112
+rect 372 1968 436 2032
+rect 372 1888 436 1952
+rect 372 1808 436 1872
+rect 372 1728 436 1792
+rect 372 1648 436 1712
+rect 372 1568 436 1632
+rect 372 1488 436 1552
+rect 372 1408 436 1472
+rect 372 1328 436 1392
+rect 372 1248 436 1312
+rect 372 1168 436 1232
+rect 372 1088 436 1152
+rect 372 1008 436 1072
+rect 372 928 436 992
+rect 372 848 436 912
+rect 372 768 436 832
+rect 372 688 436 752
+rect 372 608 436 672
+rect 372 528 436 592
+rect 372 448 436 512
+rect 372 368 436 432
+rect 372 288 436 352
+rect 372 208 436 272
+rect 372 128 436 192
+rect 372 48 436 112
+rect 372 -32 436 32
+rect 372 -112 436 -48
+rect 372 -192 436 -128
+rect 372 -272 436 -208
+rect 372 -352 436 -288
+rect 372 -432 436 -368
+rect 372 -512 436 -448
+rect 372 -592 436 -528
+rect 372 -672 436 -608
+rect 372 -752 436 -688
+rect 372 -832 436 -768
+rect 372 -912 436 -848
+rect 372 -992 436 -928
+rect 372 -1072 436 -1008
+rect 372 -1152 436 -1088
+rect 372 -1232 436 -1168
+rect 372 -1312 436 -1248
+rect 372 -1392 436 -1328
+rect 372 -1472 436 -1408
+rect 372 -1552 436 -1488
+rect 372 -1632 436 -1568
+rect 372 -1712 436 -1648
+rect 372 -1792 436 -1728
+rect 372 -1872 436 -1808
+rect 372 -1952 436 -1888
+rect 372 -2032 436 -1968
+rect 372 -2112 436 -2048
+rect 372 -2192 436 -2128
+rect 372 -2272 436 -2208
+<< mimcap >>
+rect -356 2152 284 2220
+rect -356 -2152 -68 2152
+rect -4 -2152 284 2152
+rect -356 -2220 284 -2152
+<< mimcapcontact >>
+rect -68 -2152 -4 2152
+<< metal4 >>
+rect 356 2272 452 2308
+rect 356 2208 372 2272
+rect 436 2208 452 2272
+rect 356 2192 452 2208
+rect -69 2152 -3 2181
+rect -69 -2152 -68 2152
+rect -4 -2152 -3 2152
+rect -69 -2181 -3 -2152
+rect 356 2128 372 2192
+rect 436 2128 452 2192
+rect 356 2112 452 2128
+rect 356 2048 372 2112
+rect 436 2048 452 2112
+rect 356 2032 452 2048
+rect 356 1968 372 2032
+rect 436 1968 452 2032
+rect 356 1952 452 1968
+rect 356 1888 372 1952
+rect 436 1888 452 1952
+rect 356 1872 452 1888
+rect 356 1808 372 1872
+rect 436 1808 452 1872
+rect 356 1792 452 1808
+rect 356 1728 372 1792
+rect 436 1728 452 1792
+rect 356 1712 452 1728
+rect 356 1648 372 1712
+rect 436 1648 452 1712
+rect 356 1632 452 1648
+rect 356 1568 372 1632
+rect 436 1568 452 1632
+rect 356 1552 452 1568
+rect 356 1488 372 1552
+rect 436 1488 452 1552
+rect 356 1472 452 1488
+rect 356 1408 372 1472
+rect 436 1408 452 1472
+rect 356 1392 452 1408
+rect 356 1328 372 1392
+rect 436 1328 452 1392
+rect 356 1312 452 1328
+rect 356 1248 372 1312
+rect 436 1248 452 1312
+rect 356 1232 452 1248
+rect 356 1168 372 1232
+rect 436 1168 452 1232
+rect 356 1152 452 1168
+rect 356 1088 372 1152
+rect 436 1088 452 1152
+rect 356 1072 452 1088
+rect 356 1008 372 1072
+rect 436 1008 452 1072
+rect 356 992 452 1008
+rect 356 928 372 992
+rect 436 928 452 992
+rect 356 912 452 928
+rect 356 848 372 912
+rect 436 848 452 912
+rect 356 832 452 848
+rect 356 768 372 832
+rect 436 768 452 832
+rect 356 752 452 768
+rect 356 688 372 752
+rect 436 688 452 752
+rect 356 672 452 688
+rect 356 608 372 672
+rect 436 608 452 672
+rect 356 592 452 608
+rect 356 528 372 592
+rect 436 528 452 592
+rect 356 512 452 528
+rect 356 448 372 512
+rect 436 448 452 512
+rect 356 432 452 448
+rect 356 368 372 432
+rect 436 368 452 432
+rect 356 352 452 368
+rect 356 288 372 352
+rect 436 288 452 352
+rect 356 272 452 288
+rect 356 208 372 272
+rect 436 208 452 272
+rect 356 192 452 208
+rect 356 128 372 192
+rect 436 128 452 192
+rect 356 112 452 128
+rect 356 48 372 112
+rect 436 48 452 112
+rect 356 32 452 48
+rect 356 -32 372 32
+rect 436 -32 452 32
+rect 356 -48 452 -32
+rect 356 -112 372 -48
+rect 436 -112 452 -48
+rect 356 -128 452 -112
+rect 356 -192 372 -128
+rect 436 -192 452 -128
+rect 356 -208 452 -192
+rect 356 -272 372 -208
+rect 436 -272 452 -208
+rect 356 -288 452 -272
+rect 356 -352 372 -288
+rect 436 -352 452 -288
+rect 356 -368 452 -352
+rect 356 -432 372 -368
+rect 436 -432 452 -368
+rect 356 -448 452 -432
+rect 356 -512 372 -448
+rect 436 -512 452 -448
+rect 356 -528 452 -512
+rect 356 -592 372 -528
+rect 436 -592 452 -528
+rect 356 -608 452 -592
+rect 356 -672 372 -608
+rect 436 -672 452 -608
+rect 356 -688 452 -672
+rect 356 -752 372 -688
+rect 436 -752 452 -688
+rect 356 -768 452 -752
+rect 356 -832 372 -768
+rect 436 -832 452 -768
+rect 356 -848 452 -832
+rect 356 -912 372 -848
+rect 436 -912 452 -848
+rect 356 -928 452 -912
+rect 356 -992 372 -928
+rect 436 -992 452 -928
+rect 356 -1008 452 -992
+rect 356 -1072 372 -1008
+rect 436 -1072 452 -1008
+rect 356 -1088 452 -1072
+rect 356 -1152 372 -1088
+rect 436 -1152 452 -1088
+rect 356 -1168 452 -1152
+rect 356 -1232 372 -1168
+rect 436 -1232 452 -1168
+rect 356 -1248 452 -1232
+rect 356 -1312 372 -1248
+rect 436 -1312 452 -1248
+rect 356 -1328 452 -1312
+rect 356 -1392 372 -1328
+rect 436 -1392 452 -1328
+rect 356 -1408 452 -1392
+rect 356 -1472 372 -1408
+rect 436 -1472 452 -1408
+rect 356 -1488 452 -1472
+rect 356 -1552 372 -1488
+rect 436 -1552 452 -1488
+rect 356 -1568 452 -1552
+rect 356 -1632 372 -1568
+rect 436 -1632 452 -1568
+rect 356 -1648 452 -1632
+rect 356 -1712 372 -1648
+rect 436 -1712 452 -1648
+rect 356 -1728 452 -1712
+rect 356 -1792 372 -1728
+rect 436 -1792 452 -1728
+rect 356 -1808 452 -1792
+rect 356 -1872 372 -1808
+rect 436 -1872 452 -1808
+rect 356 -1888 452 -1872
+rect 356 -1952 372 -1888
+rect 436 -1952 452 -1888
+rect 356 -1968 452 -1952
+rect 356 -2032 372 -1968
+rect 436 -2032 452 -1968
+rect 356 -2048 452 -2032
+rect 356 -2112 372 -2048
+rect 436 -2112 452 -2048
+rect 356 -2128 452 -2112
+rect 356 -2192 372 -2128
+rect 436 -2192 452 -2128
+rect 356 -2208 452 -2192
+rect 356 -2272 372 -2208
+rect 436 -2272 452 -2208
+rect 356 -2308 452 -2272
+<< properties >>
+string FIXED_BBOX -456 -2320 384 2320
+<< end >>
diff --git a/mag/sky130_fd_pr__cap_mim_m3_2_4SGG6N.mag b/mag/sky130_fd_pr__cap_mim_m3_2_4SGG6N.mag
new file mode 100644
index 0000000..1f4c692
--- /dev/null
+++ b/mag/sky130_fd_pr__cap_mim_m3_2_4SGG6N.mag
@@ -0,0 +1,121 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< metal4 >>
+rect -2231 2198 2231 2320
+rect -2231 1962 1975 2198
+rect 2211 1962 2231 2198
+rect -2231 1878 2231 1962
+rect -2231 1642 1975 1878
+rect 2211 1642 2231 1878
+rect -2231 1558 2231 1642
+rect -2231 1322 1975 1558
+rect 2211 1322 2231 1558
+rect -2231 1238 2231 1322
+rect -2231 1002 1975 1238
+rect 2211 1002 2231 1238
+rect -2231 918 2231 1002
+rect -2231 682 1975 918
+rect 2211 682 2231 918
+rect -2231 598 2231 682
+rect -2231 362 1975 598
+rect 2211 362 2231 598
+rect -2231 278 2231 362
+rect -2231 42 1975 278
+rect 2211 42 2231 278
+rect -2231 -42 2231 42
+rect -2231 -278 1975 -42
+rect 2211 -278 2231 -42
+rect -2231 -362 2231 -278
+rect -2231 -598 1975 -362
+rect 2211 -598 2231 -362
+rect -2231 -682 2231 -598
+rect -2231 -918 1975 -682
+rect 2211 -918 2231 -682
+rect -2231 -1002 2231 -918
+rect -2231 -1238 1975 -1002
+rect 2211 -1238 2231 -1002
+rect -2231 -1322 2231 -1238
+rect -2231 -1558 1975 -1322
+rect 2211 -1558 2231 -1322
+rect -2231 -1642 2231 -1558
+rect -2231 -1878 1975 -1642
+rect 2211 -1878 2231 -1642
+rect -2231 -1962 2231 -1878
+rect -2231 -2198 1975 -1962
+rect 2211 -2198 2231 -1962
+rect -2231 -2320 2231 -2198
+<< via4 >>
+rect 1975 1962 2211 2198
+rect 1975 1642 2211 1878
+rect 1975 1322 2211 1558
+rect 1975 1002 2211 1238
+rect 1975 682 2211 918
+rect 1975 362 2211 598
+rect 1975 42 2211 278
+rect 1975 -278 2211 -42
+rect 1975 -598 2211 -362
+rect 1975 -918 2211 -682
+rect 1975 -1238 2211 -1002
+rect 1975 -1558 2211 -1322
+rect 1975 -1878 2211 -1642
+rect 1975 -2198 2211 -1962
+<< mimcap2 >>
+rect -2131 2038 1629 2220
+rect -2131 -2038 -1969 2038
+rect 1467 -2038 1629 2038
+rect -2131 -2220 1629 -2038
+<< mimcap2contact >>
+rect -1969 -2038 1467 2038
+<< metal5 >>
+rect -2115 2038 1613 2204
+rect -2115 -2038 -1969 2038
+rect 1467 -2038 1613 2038
+rect -2115 -2204 1613 -2038
+rect 1933 2198 2253 2321
+rect 1933 1962 1975 2198
+rect 2211 1962 2253 2198
+rect 1933 1878 2253 1962
+rect 1933 1642 1975 1878
+rect 2211 1642 2253 1878
+rect 1933 1558 2253 1642
+rect 1933 1322 1975 1558
+rect 2211 1322 2253 1558
+rect 1933 1238 2253 1322
+rect 1933 1002 1975 1238
+rect 2211 1002 2253 1238
+rect 1933 918 2253 1002
+rect 1933 682 1975 918
+rect 2211 682 2253 918
+rect 1933 598 2253 682
+rect 1933 362 1975 598
+rect 2211 362 2253 598
+rect 1933 278 2253 362
+rect 1933 42 1975 278
+rect 2211 42 2253 278
+rect 1933 -42 2253 42
+rect 1933 -278 1975 -42
+rect 2211 -278 2253 -42
+rect 1933 -362 2253 -278
+rect 1933 -598 1975 -362
+rect 2211 -598 2253 -362
+rect 1933 -682 2253 -598
+rect 1933 -918 1975 -682
+rect 2211 -918 2253 -682
+rect 1933 -1002 2253 -918
+rect 1933 -1238 1975 -1002
+rect 2211 -1238 2253 -1002
+rect 1933 -1322 2253 -1238
+rect 1933 -1558 1975 -1322
+rect 2211 -1558 2253 -1322
+rect 1933 -1642 2253 -1558
+rect 1933 -1878 1975 -1642
+rect 2211 -1878 2253 -1642
+rect 1933 -1962 2253 -1878
+rect 1933 -2198 1975 -1962
+rect 2211 -2198 2253 -1962
+rect 1933 -2321 2253 -2198
+<< properties >>
+string FIXED_BBOX -2231 -2320 1729 2320
+<< end >>
diff --git a/mag/sky130_fd_pr__cap_mim_m3_2_7PBNAZ.mag b/mag/sky130_fd_pr__cap_mim_m3_2_7PBNAZ.mag
new file mode 100644
index 0000000..a17dc82
--- /dev/null
+++ b/mag/sky130_fd_pr__cap_mim_m3_2_7PBNAZ.mag
@@ -0,0 +1,121 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< metal4 >>
+rect -671 2198 671 2320
+rect -671 1962 415 2198
+rect 651 1962 671 2198
+rect -671 1878 671 1962
+rect -671 1642 415 1878
+rect 651 1642 671 1878
+rect -671 1558 671 1642
+rect -671 1322 415 1558
+rect 651 1322 671 1558
+rect -671 1238 671 1322
+rect -671 1002 415 1238
+rect 651 1002 671 1238
+rect -671 918 671 1002
+rect -671 682 415 918
+rect 651 682 671 918
+rect -671 598 671 682
+rect -671 362 415 598
+rect 651 362 671 598
+rect -671 278 671 362
+rect -671 42 415 278
+rect 651 42 671 278
+rect -671 -42 671 42
+rect -671 -278 415 -42
+rect 651 -278 671 -42
+rect -671 -362 671 -278
+rect -671 -598 415 -362
+rect 651 -598 671 -362
+rect -671 -682 671 -598
+rect -671 -918 415 -682
+rect 651 -918 671 -682
+rect -671 -1002 671 -918
+rect -671 -1238 415 -1002
+rect 651 -1238 671 -1002
+rect -671 -1322 671 -1238
+rect -671 -1558 415 -1322
+rect 651 -1558 671 -1322
+rect -671 -1642 671 -1558
+rect -671 -1878 415 -1642
+rect 651 -1878 671 -1642
+rect -671 -1962 671 -1878
+rect -671 -2198 415 -1962
+rect 651 -2198 671 -1962
+rect -671 -2320 671 -2198
+<< via4 >>
+rect 415 1962 651 2198
+rect 415 1642 651 1878
+rect 415 1322 651 1558
+rect 415 1002 651 1238
+rect 415 682 651 918
+rect 415 362 651 598
+rect 415 42 651 278
+rect 415 -278 651 -42
+rect 415 -598 651 -362
+rect 415 -918 651 -682
+rect 415 -1238 651 -1002
+rect 415 -1558 651 -1322
+rect 415 -1878 651 -1642
+rect 415 -2198 651 -1962
+<< mimcap2 >>
+rect -571 2038 69 2220
+rect -571 -2038 -529 2038
+rect 27 -2038 69 2038
+rect -571 -2220 69 -2038
+<< mimcap2contact >>
+rect -529 -2038 27 2038
+<< metal5 >>
+rect -555 2038 53 2204
+rect -555 -2038 -529 2038
+rect 27 -2038 53 2038
+rect -555 -2204 53 -2038
+rect 373 2198 693 2321
+rect 373 1962 415 2198
+rect 651 1962 693 2198
+rect 373 1878 693 1962
+rect 373 1642 415 1878
+rect 651 1642 693 1878
+rect 373 1558 693 1642
+rect 373 1322 415 1558
+rect 651 1322 693 1558
+rect 373 1238 693 1322
+rect 373 1002 415 1238
+rect 651 1002 693 1238
+rect 373 918 693 1002
+rect 373 682 415 918
+rect 651 682 693 918
+rect 373 598 693 682
+rect 373 362 415 598
+rect 651 362 693 598
+rect 373 278 693 362
+rect 373 42 415 278
+rect 651 42 693 278
+rect 373 -42 693 42
+rect 373 -278 415 -42
+rect 651 -278 693 -42
+rect 373 -362 693 -278
+rect 373 -598 415 -362
+rect 651 -598 693 -362
+rect 373 -682 693 -598
+rect 373 -918 415 -682
+rect 651 -918 693 -682
+rect 373 -1002 693 -918
+rect 373 -1238 415 -1002
+rect 651 -1238 693 -1002
+rect 373 -1322 693 -1238
+rect 373 -1558 415 -1322
+rect 651 -1558 693 -1322
+rect 373 -1642 693 -1558
+rect 373 -1878 415 -1642
+rect 651 -1878 693 -1642
+rect 373 -1962 693 -1878
+rect 373 -2198 415 -1962
+rect 651 -2198 693 -1962
+rect 373 -2321 693 -2198
+<< properties >>
+string FIXED_BBOX -671 -2320 169 2320
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_59MFY5.mag b/mag/sky130_fd_pr__nfet_01v8_59MFY5.mag
new file mode 100644
index 0000000..1748aff
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_59MFY5.mag
@@ -0,0 +1,80 @@
+magic
+tech sky130A
+timestamp 1640975112
+<< error_p >>
+rect 7 -45 8 78
+rect -14 -53 14 -50
+rect -16 -70 16 -53
+rect -14 -73 14 -70
+<< pwell >>
+rect -49 -47 49 78
+<< nmos >>
+rect -7 -34 7 65
+<< ndiff >>
+rect -36 58 -7 65
+rect -36 41 -30 58
+rect -13 41 -7 58
+rect -36 24 -7 41
+rect -36 7 -30 24
+rect -13 7 -7 24
+rect -36 -10 -7 7
+rect -36 -27 -30 -10
+rect -13 -27 -7 -10
+rect -36 -34 -7 -27
+rect 7 58 36 65
+rect 7 41 13 58
+rect 30 41 36 58
+rect 7 24 36 41
+rect 7 7 13 24
+rect 30 7 36 24
+rect 7 -10 36 7
+rect 7 -27 13 -10
+rect 30 -27 36 -10
+rect 7 -34 36 -27
+<< ndiffc >>
+rect -30 41 -13 58
+rect -30 7 -13 24
+rect -30 -27 -13 -10
+rect 13 41 30 58
+rect 13 7 30 24
+rect 13 -27 30 -10
+<< poly >>
+rect -7 65 7 78
+rect -7 -45 7 -34
+rect -16 -78 16 -45
+<< locali >>
+rect -30 58 -13 67
+rect -30 24 -13 25
+rect -30 6 -13 7
+rect -30 -36 -13 -27
+rect 13 58 30 67
+rect 13 24 30 25
+rect 13 6 30 7
+rect 13 -36 30 -27
+rect -16 -70 16 -53
+<< viali >>
+rect -30 41 -13 42
+rect -30 25 -13 41
+rect -30 -10 -13 6
+rect -30 -11 -13 -10
+rect 13 41 30 42
+rect 13 25 30 41
+rect 13 -10 30 6
+rect 13 -11 30 -10
+<< metal1 >>
+rect -33 42 -10 65
+rect -33 25 -30 42
+rect -13 25 -10 42
+rect -33 6 -10 25
+rect -33 -11 -30 6
+rect -13 -11 -10 6
+rect -33 -34 -10 -11
+rect 10 42 33 65
+rect 10 25 13 42
+rect 30 25 33 42
+rect 10 6 33 25
+rect 10 -11 13 6
+rect 30 -11 33 6
+rect 10 -34 33 -11
+rect -14 -73 14 -50
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_6H9P4D.mag b/mag/sky130_fd_pr__nfet_01v8_6H9P4D.mag
new file mode 100644
index 0000000..ce9cf5d
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_6H9P4D.mag
@@ -0,0 +1,75 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< error_p >>
+rect 14 -126 16 126
+<< pwell >>
+rect -98 -126 98 126
+<< nmos >>
+rect -14 -100 14 100
+<< ndiff >>
+rect -72 85 -14 100
+rect -72 51 -60 85
+rect -26 51 -14 85
+rect -72 17 -14 51
+rect -72 -17 -60 17
+rect -26 -17 -14 17
+rect -72 -51 -14 -17
+rect -72 -85 -60 -51
+rect -26 -85 -14 -51
+rect -72 -100 -14 -85
+rect 14 85 72 100
+rect 14 51 26 85
+rect 60 51 72 85
+rect 14 17 72 51
+rect 14 -17 26 17
+rect 60 -17 72 17
+rect 14 -51 72 -17
+rect 14 -85 26 -51
+rect 60 -85 72 -51
+rect 14 -100 72 -85
+<< ndiffc >>
+rect -60 51 -26 85
+rect -60 -17 -26 17
+rect -60 -85 -26 -51
+rect 26 51 60 85
+rect 26 -17 60 17
+rect 26 -85 60 -51
+<< poly >>
+rect -14 100 14 126
+rect -14 -126 14 -100
+<< locali >>
+rect -60 85 -26 104
+rect -60 17 -26 19
+rect -60 -19 -26 -17
+rect -60 -104 -26 -85
+rect 26 85 60 104
+rect 26 17 60 19
+rect 26 -19 60 -17
+rect 26 -104 60 -85
+<< viali >>
+rect -60 51 -26 53
+rect -60 19 -26 51
+rect -60 -51 -26 -19
+rect -60 -53 -26 -51
+rect 26 51 60 53
+rect 26 19 60 51
+rect 26 -51 60 -19
+rect 26 -53 60 -51
+<< metal1 >>
+rect -66 53 -20 100
+rect -66 19 -60 53
+rect -26 19 -20 53
+rect -66 -19 -20 19
+rect -66 -53 -60 -19
+rect -26 -53 -20 -19
+rect -66 -100 -20 -53
+rect 20 53 66 100
+rect 20 19 26 53
+rect 60 19 66 53
+rect 20 -19 66 19
+rect 20 -53 26 -19
+rect 60 -53 66 -19
+rect 20 -100 66 -53
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_MA8JHN.mag b/mag/sky130_fd_pr__pfet_01v8_MA8JHN.mag
new file mode 100644
index 0000000..84f4d39
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_MA8JHN.mag
@@ -0,0 +1,81 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1640975112
+<< error_p >>
+rect -28 144 28 150
+rect -32 110 32 144
+rect -28 104 28 110
+rect 14 -162 16 94
+<< nwell >>
+rect -108 -198 108 164
+<< pmos >>
+rect -14 -136 14 64
+<< pdiff >>
+rect -72 49 -14 64
+rect -72 15 -60 49
+rect -26 15 -14 49
+rect -72 -19 -14 15
+rect -72 -53 -60 -19
+rect -26 -53 -14 -19
+rect -72 -87 -14 -53
+rect -72 -121 -60 -87
+rect -26 -121 -14 -87
+rect -72 -136 -14 -121
+rect 14 49 72 64
+rect 14 15 26 49
+rect 60 15 72 49
+rect 14 -19 72 15
+rect 14 -53 26 -19
+rect 60 -53 72 -19
+rect 14 -87 72 -53
+rect 14 -121 26 -87
+rect 60 -121 72 -87
+rect 14 -136 72 -121
+<< pdiffc >>
+rect -60 15 -26 49
+rect -60 -53 -26 -19
+rect -60 -121 -26 -87
+rect 26 15 60 49
+rect 26 -53 60 -19
+rect 26 -121 60 -87
+<< poly >>
+rect -32 94 32 160
+rect -14 64 14 94
+rect -14 -162 14 -136
+<< locali >>
+rect -32 110 32 144
+rect -60 49 -26 68
+rect -60 -19 -26 -17
+rect -60 -55 -26 -53
+rect -60 -140 -26 -121
+rect 26 49 60 68
+rect 26 -19 60 -17
+rect 26 -55 60 -53
+rect 26 -140 60 -121
+<< viali >>
+rect -60 15 -26 17
+rect -60 -17 -26 15
+rect -60 -87 -26 -55
+rect -60 -89 -26 -87
+rect 26 15 60 17
+rect 26 -17 60 15
+rect 26 -87 60 -55
+rect 26 -89 60 -87
+<< metal1 >>
+rect -28 104 28 150
+rect -66 17 -20 64
+rect -66 -17 -60 17
+rect -26 -17 -20 17
+rect -66 -55 -20 -17
+rect -66 -89 -60 -55
+rect -26 -89 -20 -55
+rect -66 -136 -20 -89
+rect 20 17 66 64
+rect 20 -17 26 17
+rect 60 -17 66 17
+rect 20 -55 66 -17
+rect 20 -89 26 -55
+rect 60 -89 66 -55
+rect 20 -136 66 -89
+<< end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index a4f3d92..22e0f6a 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,33 +1,116 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1639841760
-<< mvpsubdiff >>
-rect 345740 628255 345764 629032
-rect 371078 628255 371102 629032
-<< mvpsubdiffcont >>
-rect 345764 628255 371078 629032
-<< locali >>
-rect 345748 628255 345764 629032
-rect 371078 628255 371094 629032
-<< viali >>
-rect 357593 628300 359298 629000
-<< metal1 >>
-rect 357470 629399 359442 629457
-rect 357470 628057 357538 629399
-rect 359388 628057 359442 629399
-rect 357470 627990 359442 628057
-<< via1 >>
-rect 357538 629000 359388 629399
-rect 357538 628300 357593 629000
-rect 357593 628300 359298 629000
-rect 359298 628300 359388 629000
-rect 357538 628057 359388 628300
+timestamp 1640977758
+<< error_s >>
+rect 556638 692448 556866 692475
+rect 556638 692420 556838 692447
+rect 556496 692407 556508 692411
+rect 556493 692397 556508 692407
+rect 556638 692407 556650 692411
+rect 556638 692397 556653 692407
+rect 556837 692397 556838 692407
+rect 556282 692395 556508 692397
+rect 556608 692396 556868 692397
+rect 556638 692395 556868 692396
+rect 556493 692355 556508 692367
+rect 556496 692351 556508 692355
+rect 556638 692355 556653 692367
+rect 556638 692351 556650 692355
+rect 556884 692349 556918 692413
+rect 556638 692315 556838 692342
+rect 556638 692287 556838 692314
+rect 556281 692248 556508 692275
+rect 556638 692248 556838 692275
+rect 556309 692220 556507 692247
+rect 556638 692220 556838 692247
+rect 556237 692149 556271 692213
+rect 556837 692197 556838 692207
+rect 556287 692195 556533 692197
+rect 556612 692195 556868 692197
+rect 556600 692154 556634 692155
+rect 556884 692149 556918 692213
+rect 556309 692115 556507 692142
+rect 556308 692087 556508 692114
+rect 556308 692048 556508 692075
+rect 556309 692020 556507 692047
+rect 556237 691949 556271 692013
+rect 556287 691995 556533 691997
+rect 556309 691915 556507 691942
+rect 556308 691887 556508 691914
+rect 558335 691894 558463 691895
+rect 558527 691894 558594 691895
+rect 556480 691875 556536 691876
+rect 556308 691848 556536 691875
+rect 556508 691847 556536 691848
+rect 556308 691820 556536 691847
+rect 556804 691862 556876 691875
+rect 556804 691842 556842 691862
+rect 556770 691808 556842 691841
+rect 556837 691797 556838 691807
+rect 556282 691796 556564 691797
+rect 556582 691796 556868 691797
+rect 556282 691795 556534 691796
+rect 556612 691795 556868 691796
+rect 556884 691749 556918 691813
+rect 556308 691715 556508 691742
+rect 556638 691715 556838 691742
+rect 556308 691687 556508 691714
+rect 556638 691687 556838 691714
+rect 556308 691648 556508 691675
+rect 556638 691648 556838 691675
+rect 556308 691620 556508 691647
+rect 556638 691620 556838 691647
+rect 556837 691597 556838 691607
+rect 556884 691597 556918 691599
+rect 556282 691596 556564 691597
+rect 556582 691596 556868 691597
+rect 556282 691595 556534 691596
+rect 556612 691595 556868 691596
+rect 556884 691565 556885 691597
+rect 556308 691515 556536 691542
+rect 556772 691515 556838 691542
+rect 556480 691514 556536 691515
+rect 556308 691487 556508 691514
+rect 556800 691494 556838 691514
+rect 556800 691487 556866 691494
+rect 556480 691486 556508 691487
+rect 556308 691448 556508 691475
+rect 556309 691420 556507 691447
+rect 556237 691349 556271 691413
+rect 556287 691395 556533 691397
+rect 556309 691315 556507 691342
+rect 556308 691287 556508 691314
+rect 556308 691248 556508 691275
+rect 556309 691220 556507 691247
+rect 556237 691149 556271 691213
+rect 556837 691197 556838 691207
+rect 556287 691195 556533 691197
+rect 556612 691195 556868 691197
+rect 556884 691149 556918 691213
+rect 556309 691115 556507 691142
+rect 556638 691115 556838 691142
+rect 556281 691087 556508 691114
+rect 556638 691087 556838 691114
+rect 556638 691048 556838 691075
+rect 556638 691020 556838 691047
+rect 556496 691007 556508 691011
+rect 556493 690997 556508 691007
+rect 556638 691007 556650 691011
+rect 556638 690997 556653 691007
+rect 556837 690997 556838 691007
+rect 556884 690997 556918 690999
+rect 556282 690995 556508 690997
+rect 556608 690996 556868 690997
+rect 556638 690995 556868 690996
+rect 556493 690955 556508 690967
+rect 556496 690951 556508 690955
+rect 556638 690955 556653 690967
+rect 556884 690965 556885 690997
+rect 556638 690951 556650 690955
+rect 556638 690915 556838 690942
+rect 556638 690887 556866 690914
 << metal2 >>
-rect 357470 629399 359442 629457
-rect 357470 628057 357538 629399
-rect 359388 628057 359442 629399
-rect 357470 627990 359442 628057
 rect 524 -800 636 480
 rect 1706 -800 1818 480
 rect 2888 -800 3000 480
@@ -523,143 +606,86 @@
 rect 582068 -800 582180 480
 rect 583250 -800 583362 480
 << via2 >>
-rect 357538 628057 359388 629399
+rect 557264 691228 557322 691958
 << metal3 >>
 rect 16194 702300 21194 704800
 rect 68194 702300 73194 704800
 rect 120194 702300 125194 704800
 rect 165594 702300 170594 704800
-rect 170894 700788 173094 704800
-rect 170894 690603 173094 700738
-rect -800 680242 1700 685242
-rect 170894 683764 173094 684327
-rect 173394 700786 175594 704800
+rect 170894 702300 173094 704800
+rect 173394 702300 175594 704800
 rect 175894 702300 180894 704800
 rect 217294 702300 222294 704800
-rect 173394 690603 175594 700736
-rect 173394 683764 175594 684327
-rect 222594 700836 224794 704800
-rect 222594 690636 224794 700786
-rect 222594 683913 224794 684360
-rect 225094 700846 227294 704800
+rect 222594 702300 224794 704800
+rect 225094 702300 227294 704800
 rect 227594 702300 232594 704800
-rect 225094 690636 227294 700796
-rect 225094 683913 227294 684360
-rect 318994 649497 323994 704800
-rect 324294 701130 326494 704800
-rect 324294 690618 326494 701080
-rect 326794 701150 328994 704800
-rect 326794 694292 328994 701100
-rect 329294 694292 334294 704800
+rect 318994 702300 323994 704800
+rect 324294 702300 326494 704800
+rect 326794 702300 328994 704800
+rect 329294 702300 334294 704800
 rect 413394 702300 418394 704800
 rect 465394 702300 470394 704800
-rect 326794 692092 334294 694292
-rect 324294 684038 326494 684344
-rect -800 643842 1660 648642
-rect 318994 642983 323994 643740
-rect 329294 649497 334294 692092
-rect 329294 642983 334294 643740
-rect 510594 690564 515394 704800
-rect -800 633842 1660 638642
-rect 510594 637598 515394 684332
-rect 510594 631116 515394 631780
-rect 520594 690564 525394 704800
+rect 510594 702340 515394 704800
+rect 520594 702340 525394 704800
 rect 566594 702300 571594 704800
-rect 520594 637598 525394 684332
+rect 467294 692950 467494 702300
+rect 467294 692830 557334 692950
+rect 557254 691958 557334 692830
+rect 557254 691228 557264 691958
+rect 557322 691228 557334 691958
+rect 557254 691210 557334 691228
+rect -800 680242 1700 685242
 rect 582300 677984 584800 682984
-rect 560050 639784 560566 644584
-rect 566742 639784 584800 644584
-rect 520594 631116 525394 631780
-rect 560050 629784 560566 634584
-rect 566742 629784 584800 634584
-rect 357470 629399 359442 629457
-rect 357470 628057 357538 629399
-rect 359388 628057 359442 629399
-rect 357470 627990 359442 628057
-rect 339960 620294 345660 620363
-rect 371099 620302 533609 620371
-rect -800 559442 1660 564242
-rect -800 549442 1660 554242
-rect 339960 511642 340072 620294
-rect 341733 619574 341739 619684
-rect 341849 619637 341855 619684
-rect 533089 619645 533095 619647
-rect 341849 619577 345660 619637
-rect 371099 619585 533095 619645
-rect 533089 619583 533095 619585
-rect 533159 619583 533165 619647
-rect 341849 619574 341855 619577
-rect 533105 619280 533111 619282
-rect -800 511530 340072 511642
-rect 340967 619212 345660 619272
-rect 371099 619220 533111 619280
-rect 533105 619218 533111 619220
-rect 533175 619218 533181 619282
-rect -800 510348 480 510460
-rect -800 509166 480 509278
-rect -800 507984 480 508096
-rect -800 506802 480 506914
-rect -800 505620 480 505732
-rect -800 468308 480 468420
-rect -800 467126 480 467238
-rect -800 465944 480 466056
-rect -800 464762 480 464874
-rect 340967 463692 341079 619212
-rect -800 463580 341079 463692
-rect 341738 618632 341850 618638
-rect -800 462398 660 462510
-rect 780 462398 13894 462510
-rect 17564 462398 17711 462510
-rect -800 425086 480 425198
-rect -800 423904 480 424016
-rect -800 422722 480 422834
-rect -800 421540 480 421652
-rect 341738 420470 341850 618520
-rect -800 420358 341850 420470
-rect -800 419176 676 419288
-rect 738 419176 13887 419288
-rect 17599 419176 17694 419288
-rect 533497 405408 533609 620302
-rect 533894 619647 533958 619653
-rect 533958 619585 539606 619645
-rect 533894 619577 533958 619583
-rect 533904 619282 533968 619288
-rect 533968 619220 537488 619280
-rect 533904 619212 533968 619218
-rect 537376 454558 537488 619220
-rect 539494 498980 539606 619585
+rect -800 643842 1660 648642
+rect 582340 639784 584800 644584
+rect -800 633842 1660 638642
+rect 582340 629784 584800 634584
 rect 583520 589472 584800 589584
 rect 583520 588290 584800 588402
 rect 583520 587108 584800 587220
 rect 583520 585926 584800 586038
 rect 583520 584744 584800 584856
 rect 583520 583562 584800 583674
-rect 555452 550562 556229 555362
-rect 562346 550562 584800 555362
-rect 555452 540562 556229 545362
-rect 562346 540562 584800 545362
-rect 573371 500050 573548 500162
-rect 576743 500050 583220 500162
-rect 583318 500050 584800 500162
-rect 539494 498868 584800 498980
+rect -800 559442 1660 564242
+rect -800 549442 1660 554242
+rect 582340 550562 584800 555362
+rect 582340 540562 584800 545362
+rect -800 511530 480 511642
+rect -800 510348 480 510460
+rect -800 509166 480 509278
+rect -800 507984 480 508096
+rect -800 506802 480 506914
+rect -800 505620 480 505732
+rect 583520 500050 584800 500162
+rect 583520 498868 584800 498980
 rect 583520 497686 584800 497798
 rect 583520 496504 584800 496616
 rect 583520 495322 584800 495434
 rect 583520 494140 584800 494252
-rect 573405 455628 573556 455740
-rect 576731 455628 583180 455740
-rect 583296 455628 584800 455740
-rect 537376 454446 584800 454558
+rect -800 468308 480 468420
+rect -800 467126 480 467238
+rect -800 465944 480 466056
+rect -800 464762 480 464874
+rect -800 463580 480 463692
+rect -800 462398 480 462510
+rect 583520 455628 584800 455740
+rect 583520 454446 584800 454558
 rect 583520 453264 584800 453376
 rect 583520 452082 584800 452194
 rect 583520 450900 584800 451012
 rect 583520 449718 584800 449830
+rect -800 425086 480 425198
+rect -800 423904 480 424016
+rect -800 422722 480 422834
+rect -800 421540 480 421652
+rect -800 420358 480 420470
+rect -800 419176 480 419288
 rect 583520 411206 584800 411318
 rect 583520 410024 584800 410136
 rect 583520 408842 584800 408954
 rect 583520 407660 584800 407772
 rect 583520 406478 584800 406590
-rect 533497 405296 584800 405408
+rect 583520 405296 584800 405408
 rect -800 381864 480 381976
 rect -800 380682 480 380794
 rect -800 379500 480 379612
@@ -706,9 +732,7 @@
 rect 582340 225230 584800 230030
 rect -800 214888 1660 219688
 rect -800 204888 1660 209688
-rect 13406 191430 13991 196230
-rect 17427 191430 573605 196230
-rect 576629 191430 584800 196230
+rect 582340 191430 584800 196230
 rect 582340 181430 584800 186230
 rect -800 172888 1660 177688
 rect -800 162888 1660 167688
@@ -774,46 +798,6 @@
 rect 583520 2726 584800 2838
 rect -800 1544 480 1656
 rect 583520 1544 584800 1656
-<< rmetal3 >>
-rect 170894 700738 173094 700788
-rect 173394 700736 175594 700786
-rect 222594 700786 224794 700836
-rect 225094 700796 227294 700846
-rect 324294 701080 326494 701130
-rect 326794 701100 328994 701150
-rect 660 462398 780 462510
-rect 676 419176 738 419288
-rect 583220 500050 583318 500162
-rect 583180 455628 583296 455740
-<< via3 >>
-rect 170894 684327 173094 690603
-rect 173394 684327 175594 690603
-rect 222594 684360 224794 690636
-rect 225094 684360 227294 690636
-rect 324294 684344 326494 690618
-rect 318994 643740 323994 649497
-rect 329294 643740 334294 649497
-rect 510594 684332 515394 690564
-rect 510594 631780 515394 637598
-rect 520594 684332 525394 690564
-rect 560566 639784 566742 644584
-rect 520594 631780 525394 637598
-rect 560566 629784 566742 634584
-rect 357538 628057 359388 629399
-rect 341739 619574 341849 619684
-rect 533095 619583 533159 619647
-rect 533111 619218 533175 619282
-rect 341738 618520 341850 618632
-rect 13894 462398 17564 462510
-rect 13887 419176 17599 419288
-rect 533894 619583 533958 619647
-rect 533904 619218 533968 619282
-rect 556229 550562 562346 555362
-rect 556229 540562 562346 545362
-rect 573548 500050 576743 500162
-rect 573556 455628 576731 455740
-rect 13991 191430 17427 196230
-rect 573605 191430 576629 196230
 << metal4 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800
@@ -821,125 +805,6 @@
 rect 227594 702300 232594 704800
 rect 318994 702300 323994 704800
 rect 329294 702300 334294 704800
-rect 170628 690636 526162 690737
-rect 170628 690603 222594 690636
-rect 170628 684327 170894 690603
-rect 173094 684327 173394 690603
-rect 175594 684360 222594 690603
-rect 224794 684360 225094 690636
-rect 227294 690618 526162 690636
-rect 227294 684360 324294 690618
-rect 175594 684344 324294 684360
-rect 326494 690564 526162 690618
-rect 326494 684344 510594 690564
-rect 175594 684332 510594 684344
-rect 515394 684332 520594 690564
-rect 525394 684332 526162 690564
-rect 175594 684327 526162 684332
-rect 170628 684183 526162 684327
-rect 318330 649837 359973 649898
-rect 318330 649497 357559 649837
-rect 318330 643740 318994 649497
-rect 323994 643740 329294 649497
-rect 334294 643740 357559 649497
-rect 318330 643394 357559 643740
-rect 359314 643394 359973 649837
-rect 318330 643344 359973 643394
-rect 560425 644584 566979 644980
-rect 560425 639784 560566 644584
-rect 566742 639784 566979 644584
-rect 356144 637598 525696 637898
-rect 356144 631780 510594 637598
-rect 515394 631780 520594 637598
-rect 525394 631780 525696 637598
-rect 356144 631344 525696 631780
-rect 560425 634584 566979 639784
-rect 357442 629399 359470 631344
-rect 357442 628057 357538 629399
-rect 359388 628057 359470 629399
-rect 357442 619873 359470 628057
-rect 560425 629784 560566 634584
-rect 566742 629784 566979 634584
-rect 341738 619684 341850 619685
-rect 341738 619574 341739 619684
-rect 341849 619574 341850 619684
-rect 341738 618633 341850 619574
-rect 356867 619473 359885 619873
-rect 533094 619647 533160 619648
-rect 533094 619583 533095 619647
-rect 533159 619645 533160 619647
-rect 533893 619647 533959 619648
-rect 533893 619645 533894 619647
-rect 533159 619585 533894 619645
-rect 533159 619583 533160 619585
-rect 533094 619582 533160 619583
-rect 533893 619583 533894 619585
-rect 533958 619583 533959 619647
-rect 533893 619582 533959 619583
-rect 533110 619282 533176 619283
-rect 533110 619218 533111 619282
-rect 533175 619280 533176 619282
-rect 533903 619282 533969 619283
-rect 533903 619280 533904 619282
-rect 533175 619220 533904 619280
-rect 533175 619218 533176 619220
-rect 533110 619217 533176 619218
-rect 533903 619218 533904 619220
-rect 533968 619218 533969 619282
-rect 533903 619217 533969 619218
-rect 341737 618632 341851 618633
-rect 341737 618520 341738 618632
-rect 341850 618520 341851 618632
-rect 341737 618519 341851 618520
-rect 345773 613756 346828 618849
-rect 351928 617829 353757 618856
-rect 351928 615249 352028 617829
-rect 353603 615249 353757 617829
-rect 351928 615131 353757 615249
-rect 363328 617835 365157 618884
-rect 363328 615255 363412 617835
-rect 364987 615255 365157 617835
-rect 363328 615131 365157 615255
-rect 369823 613756 370980 618859
-rect 560425 613756 566979 629784
-rect 345256 607202 566979 613756
-rect 362658 601572 562613 601756
-rect 362658 597231 363414 601572
-rect 364992 597231 562613 601572
-rect 362658 595202 562613 597231
-rect 556059 555362 562613 595202
-rect 556059 550562 556229 555362
-rect 562346 550562 562613 555362
-rect 556059 545362 562613 550562
-rect 556059 540562 556229 545362
-rect 562346 540562 562613 545362
-rect 556059 540155 562613 540562
-rect 573464 500162 576816 500473
-rect 573464 500050 573548 500162
-rect 576743 500050 576816 500162
-rect 13814 462510 17684 462771
-rect 13814 462398 13894 462510
-rect 17564 462398 17684 462510
-rect 13814 419288 17684 462398
-rect 13814 419176 13887 419288
-rect 17599 419176 17684 419288
-rect 13814 227257 17684 419176
-rect 573464 455740 576816 500050
-rect 573464 455628 573556 455740
-rect 576731 455628 576816 455740
-rect 13811 196230 17688 227257
-rect 13811 191430 13991 196230
-rect 17427 191430 17688 196230
-rect 13811 191098 17688 191430
-rect 573464 196230 576816 455628
-rect 573464 191430 573605 196230
-rect 576629 191430 576816 196230
-rect 573464 191191 576816 191430
-<< via4 >>
-rect 357559 643394 359314 649837
-rect 352028 615249 353603 617829
-rect 363412 615255 364987 617835
-rect 363414 597231 364992 601572
 << metal5 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800
@@ -947,31 +812,15 @@
 rect 227594 702300 232594 704800
 rect 318994 702300 323994 704800
 rect 329294 702300 334294 704800
-rect 357521 649837 359350 649991
-rect 357521 643394 357559 649837
-rect 359314 643394 359350 649837
-rect 351918 617829 353747 617929
-rect 351918 615249 352028 617829
-rect 353603 615249 353747 617829
-rect 351918 614900 353747 615249
-rect 357521 614900 359350 643394
-rect 351918 613071 359350 614900
-rect 363318 617835 365147 617929
-rect 363318 615255 363412 617835
-rect 364987 615255 365147 617835
-rect 363318 601572 365147 615255
-rect 363318 597231 363414 601572
-rect 364992 597231 365147 601572
-rect 363318 597052 365147 597231
 << comment >>
 rect -100 704000 584100 704100
 rect -100 0 0 704000
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
-use user_analog_proj_example  user_analog_proj_example_0
-timestamp 1639841760
-transform 1 0 345668 0 -1 627114
-box -59 -22 25476 8324
+use SDC_v1p2  SDC_v1p2_0 ~/Documents/Postdoc/github/caravel_user_project_analog/mag/../../../sky130_work_jm/SDC_SKY130_V1/layout
+timestamp 1640969942
+transform -1 0 579732 0 1 684648
+box 1706 -364 23628 14394
 << labels >>
 flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
 port 0 nsew signal bidirectional
@@ -2353,10 +2202,6 @@
 port 676 nsew signal input
 flabel metal2 s 6434 -800 6546 480 0 FreeSans 1120 90 0 0 wbs_we_i
 port 677 nsew signal input
-flabel metal3 572152 640142 580220 644150 0 FreeSans 16000 0 0 0 VCCD1
-flabel metal3 567038 550960 577302 554546 0 FreeSans 16000 0 0 0 VDDA1
-flabel metal3 511190 664896 514962 676272 0 FreeSans 16000 90 0 0 VSSA1
-flabel metal3 561703 191929 571721 195859 0 FreeSans 16000 0 0 0 VSSD1
 << properties >>
 string FIXED_BBOX 0 0 584000 704000
 << end >>
diff --git a/mag/user_analog_project_wrapper_empty.mag b/mag/user_analog_project_wrapper_empty.mag
index 02dbe79..4a1b2d6 100644
--- a/mag/user_analog_project_wrapper_empty.mag
+++ b/mag/user_analog_project_wrapper_empty.mag
@@ -1,11 +1,6 @@
 magic
 tech sky130A
-timestamp 1632839657
-<< checkpaint >>
-rect -680 351370 292680 352680
-rect -680 630 630 351370
-rect 291370 630 292680 351370
-rect -680 -680 292680 630
+timestamp 1640970208
 << metal2 >>
 rect 262 -400 318 240
 rect 853 -400 909 240