Ring oscillator LVS/DRC clean.
diff --git a/mag/fs.magicrc b/mag/fs.magicrc
new file mode 100644
index 0000000..7d98e65
--- /dev/null
+++ b/mag/fs.magicrc
@@ -0,0 +1,73 @@
+puts stdout "Sourcing design .magicrc for technology sky130A ..."
+
+# Put grid on 0.005 pitch.  This is important, as some commands don't
+# rescale the grid automatically (such as lef read?).
+
+set scalefac [tech lambda]
+if {[lindex $scalefac 1] < 2} {
+    scalegrid 1 2
+}
+
+# drc off
+drc euclidean on
+
+# Allow override of PDK path from environment variable PDKPATH
+if {[catch {set PDKPATH $env(PDKPATH)}]} {
+    set PDKPATH "~/mabrains/skywater-pdk/sky130A"
+}
+
+# loading technology
+tech load $PDKPATH/libs.tech/magic/current/sky130A.tech
+
+# load device generator
+source $PDKPATH/libs.tech/magic/current/sky130A.tcl
+
+# load bind keys (optional)
+# source $PDKPATH/libs.tech/magic/current/sky130A-BindKeys
+
+# set units to lambda grid 
+snap lambda
+
+# set sky130 standard power, ground, and substrate names
+set VDD VPWR
+set GND VGND
+set SUB VSUBS
+
+# Allow override of type of magic library views used, "mag" or "maglef",
+# from environment variable MAGTYPE
+
+if {[catch {set MAGTYPE $env(MAGTYPE)}]} {
+   set MAGTYPE maglef
+}
+
+# add path to reference cells
+if {[file isdir ${PDKPATH}/libs.ref/${MAGTYPE}]} {
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_pr
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_io
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_hd
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_hdll
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_hs
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_hvl
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_lp
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_ls
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_fd_sc_ms
+    addpath ${PDKPATH}/libs.ref/${MAGTYPE}/sky130_osu_sc
+} else {
+    addpath ${PDKPATH}/libs.ref/sky130_fd_pr/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_io/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_hd/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_hdll/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_hs/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_hvl/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_lp/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_ls/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_fd_sc_ms/${MAGTYPE}
+    addpath ${PDKPATH}/libs.ref/sky130_osu_sc/${MAGTYPE}
+}
+
+# add path to GDS cells
+
+# add path to IP from catalog.  This procedure defined in the PDK script.
+catch {magic::query_mylib_ip}
+# add path to local IP from user design space.  Defined in the PDK script.
+catch {magic::query_my_projects}
diff --git a/mag/inverter.mag b/mag/inverter.mag
index 0006a75..a7126a6 100644
--- a/mag/inverter.mag
+++ b/mag/inverter.mag
@@ -1,15 +1,14 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1608336920
+timestamp 1608352248
 << nwell >>
 rect -5252 1004 -4822 1124
 rect -5252 694 -4826 1004
 << pwell >>
-rect -5250 504 -4822 546
-rect -5250 418 -4826 504
-rect -5252 266 -4826 418
-rect -5250 192 -4826 266
+rect -5252 504 -4822 546
+rect -5252 192 -4826 504
+rect -5252 188 -5242 192
 rect -5182 188 -4826 192
 << psubdiff >>
 rect -5252 240 -5188 294
@@ -61,12 +60,12 @@
 rect -5252 408 -5122 482
 rect -5070 408 -4822 482
 rect -5252 396 -4822 408
-use sky130_fd_pr__nfet_01v8_PUCP6T  inv_nfet
-timestamp 1608326735
-transform 1 0 -5033 0 1 443
-box -211 -255 211 77
 use sky130_fd_pr__pfet_01v8_35M7SK  sky130_fd_pr__pfet_01v8_35M7SK_0
 timestamp 1608326616
 transform 1 0 -5033 0 1 822
 box -211 -128 211 188
+use sky130_fd_pr__nfet_01v8_PUCP6T  inv_nfet
+timestamp 1608326735
+transform 1 0 -5033 0 1 443
+box -211 -255 211 77
 << end >>
diff --git a/mag/ring_vco.mag b/mag/ring_vco.mag
index 695c94c..af15ea9 100644
--- a/mag/ring_vco.mag
+++ b/mag/ring_vco.mag
@@ -1,18 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1608340973
+timestamp 1608352248
 << nwell >>
-rect -5124 5197 6787 5532
+rect -5124 5197 6792 5532
 rect -5124 5195 5831 5197
 rect -5124 5190 5094 5195
-rect 3800 4889 5996 4893
-rect 3800 4875 5999 4889
-rect 3800 4122 5996 4875
+rect 3800 4122 5514 4893
+rect 6289 4441 6792 5197
 rect 4280 4023 4727 4122
 rect 4280 3871 4475 4023
-rect 5514 3923 5996 4122
-rect 6289 3929 6785 5197
+rect 6289 3947 6785 4441
 << pwell >>
 rect 5563 3908 5957 3913
 rect 5556 3689 5957 3908
@@ -76,8 +74,16 @@
 rect 3596 5326 3630 5366
 rect 4791 5331 4833 5371
 rect 6125 5331 6159 5371
-rect 5465 4705 5539 4745
-rect 5465 4461 5539 4521
+rect 6345 5296 6369 5375
+rect 6721 5296 6745 5375
+rect 6342 5142 6366 5221
+rect 6718 5142 6742 5221
+rect 6336 5001 6360 5080
+rect 6712 5001 6736 5080
+rect 6334 4845 6358 4924
+rect 6710 4845 6734 4924
+rect 6326 4697 6350 4776
+rect 6702 4697 6726 4776
 << psubdiffcont >>
 rect 5767 3159 6631 3195
 rect 5771 3057 6635 3093
@@ -104,12 +110,19 @@
 rect -54 5298 1238 5338
 rect 2304 5326 3596 5366
 rect 4833 5331 6125 5371
-rect 5465 4521 5539 4705
+rect 6369 5296 6721 5375
+rect 6366 5142 6718 5221
+rect 6360 5001 6712 5080
+rect 6358 4845 6710 4924
+rect 6350 4697 6702 4776
 << poly >>
+rect 5698 4268 5728 4325
+rect 5794 4268 5824 4326
+rect 5698 4234 5824 4268
 rect 5496 3942 5610 3958
 rect 5496 3902 5512 3942
 rect 5592 3925 5610 3942
-rect 5773 3925 5803 4704
+rect 5773 3925 5803 4234
 rect 6216 3943 6246 3958
 rect 5592 3902 5803 3925
 rect 5496 3891 5803 3902
@@ -125,6 +138,7 @@
 rect 6181 3875 6246 3877
 rect 6216 3862 6246 3875
 rect 6565 3490 6595 3891
+rect -110 2859 25 2925
 << polycont >>
 rect 5512 3902 5592 3942
 rect 6183 3893 6217 3927
@@ -181,13 +195,16 @@
 rect 3596 5326 3630 5328
 rect -96 5298 -54 5300
 rect 1238 5298 1272 5300
-rect 5465 4717 5539 4745
-rect 5465 4705 5483 4717
-rect 5517 4705 5539 4717
-rect 5465 4501 5539 4521
-rect 5465 4467 5483 4501
-rect 5517 4467 5539 4501
-rect 5465 4461 5539 4467
+rect 6353 5296 6369 5375
+rect 6721 5296 6737 5375
+rect 6350 5142 6366 5221
+rect 6718 5142 6734 5221
+rect 6344 5001 6360 5080
+rect 6712 5001 6728 5080
+rect 6342 4845 6358 4924
+rect 6710 4845 6726 4924
+rect 6334 4697 6350 4776
+rect 6702 4697 6718 4776
 rect 5496 3942 5610 3958
 rect 5496 3902 5512 3942
 rect 5592 3902 5610 3942
@@ -208,6 +225,7 @@
 rect 6693 2965 6723 2999
 rect 5713 2963 5773 2965
 rect 6637 2963 6723 2965
+rect 7 2875 14 2909
 rect 5713 2853 5723 2887
 rect 5757 2853 5773 2887
 rect 6637 2853 6659 2887
@@ -435,11 +453,7 @@
 rect 6097 5333 6125 5367
 rect 6125 5333 6131 5367
 rect 6169 5333 6203 5367
-rect 5483 4705 5517 4717
-rect 5483 4683 5517 4705
-rect 5483 4611 5517 4645
-rect 5483 4539 5517 4573
-rect 5483 4467 5517 4501
+rect 5534 4714 5984 4811
 rect 5512 3902 5592 3942
 rect 6183 3893 6217 3927
 rect 5721 3059 5755 3093
@@ -470,6 +484,7 @@
 rect 6515 2965 6549 2999
 rect 6587 2965 6621 2999
 rect 6659 2965 6693 2999
+rect -81 2875 7 2909
 rect 5723 2853 5757 2887
 rect 5795 2853 5829 2887
 rect 5867 2853 5901 2887
@@ -860,24 +875,23 @@
 rect -32 5035 -1 5039
 rect -32 4220 135 5035
 rect -29 4207 135 4220
-rect 3939 4871 4093 4872
-rect 3939 4717 5759 4871
-rect 3939 4683 5483 4717
-rect 5517 4683 5759 4717
-rect 3939 4645 5759 4683
-rect 3939 4611 5483 4645
-rect 5517 4611 5759 4645
-rect 3939 4573 5759 4611
+rect 3939 4817 5989 4818
+rect 3939 4811 5996 4817
+rect 3939 4714 5534 4811
+rect 5984 4714 5996 4811
+rect 3939 4708 5996 4714
 rect 6298 4711 6790 5198
-rect 3939 4570 5483 4573
+rect 3939 4680 5989 4708
+rect 3939 4570 5422 4680
+rect 5738 4597 5784 4680
 rect 3939 4121 4311 4570
-rect 5422 4539 5483 4570
-rect 5517 4539 5759 4573
-rect 5422 4501 5759 4539
-rect 5422 4467 5483 4501
-rect 5517 4467 5759 4501
-rect 5422 4178 5759 4467
-rect 5567 4177 5759 4178
+rect 6298 4456 6788 4711
+rect 5642 4229 5688 4355
+rect 5836 4347 5875 4352
+rect 5833 4229 5878 4347
+rect 5642 4183 5878 4229
+rect 5833 4065 5878 4183
+rect 6517 4165 6551 4456
 rect 4936 3930 4946 4016
 rect 5118 4002 5128 4016
 rect 5118 3958 5605 4002
@@ -886,11 +900,8 @@
 rect 5494 3942 5610 3944
 rect 5494 3902 5512 3942
 rect 5592 3902 5610 3942
-rect -4419 3829 -4286 3892
 rect 5494 3884 5610 3902
-rect 5815 3927 5849 4597
-rect 6298 4456 6788 4711
-rect 6517 4165 6551 4456
+rect 5815 3927 5878 4065
 rect 6089 3927 6099 3944
 rect 6220 3943 6230 3944
 rect 6221 3927 6231 3943
@@ -898,11 +909,11 @@
 rect 6221 3925 6246 3927
 rect 6607 3925 6639 4355
 rect 5504 3881 5562 3884
-rect -4430 3743 -4420 3829
-rect -4275 3828 -4265 3829
-rect -4275 3754 -4229 3828
+rect -4077 3714 -4067 3864
+rect -3917 3828 -3907 3864
+rect -3917 3754 -3803 3828
 rect 4209 3754 4628 3828
-rect -4275 3743 -4265 3754
+rect -3917 3714 -3907 3754
 rect 4231 3660 4498 3691
 rect 4231 3645 4254 3660
 rect 4227 3590 4254 3645
@@ -910,29 +921,38 @@
 rect 4340 3636 4498 3660
 rect 4340 3590 4351 3636
 rect 4340 3574 4350 3590
+rect 5352 3519 5756 3583
 rect -4767 2937 -4470 3109
 rect -4736 2935 -4470 2937
 rect -179 2943 -89 3157
+rect -47 2959 -37 3157
+rect 76 2959 86 3157
 rect -4898 2804 -4862 2932
 rect -4834 2848 -4824 2902
 rect -4764 2848 -4754 2902
 rect -3768 2804 -3732 2805
 rect -179 2804 -137 2943
+rect -109 2911 -90 2915
+rect -39 2911 20 2915
 rect -109 2857 -99 2911
-rect -39 2857 -29 2911
+rect 14 2857 20 2911
+rect -109 2854 20 2857
 rect 204 2804 379 3501
+rect 4650 2804 5165 3414
+rect 5352 3155 5416 3519
 rect 5815 3479 5849 3891
 rect 6089 3874 6099 3891
 rect 6221 3891 6250 3925
 rect 6607 3891 6897 3925
 rect 6221 3875 6231 3891
 rect 6220 3874 6230 3875
-rect 4650 2804 5165 3414
-rect 5900 3356 5957 3424
-rect 6517 3422 6553 3625
 rect 6607 3531 6639 3891
+rect 5900 3356 5957 3424
+rect 6513 3422 6559 3531
 rect 5649 3225 5957 3356
 rect 6159 3225 6800 3422
+rect 5342 2979 5352 3155
+rect 5416 2979 5426 3155
 rect 5650 3093 6802 3225
 rect 5650 3059 5721 3093
 rect 5755 3059 5793 3093
@@ -1168,12 +1188,18 @@
 rect 6099 3893 6183 3927
 rect 6183 3893 6217 3927
 rect 6217 3893 6221 3927
-rect -4420 3743 -4275 3829
+rect -4067 3714 -3917 3864
 rect 4254 3574 4340 3660
+rect -37 2959 76 3157
 rect -4824 2848 -4764 2902
-rect -99 2857 -39 2911
+rect -99 2909 14 2911
+rect -99 2875 -81 2909
+rect -81 2875 7 2909
+rect 7 2875 14 2909
+rect -99 2857 14 2875
 rect 6099 3875 6221 3893
 rect 6099 3874 6220 3875
+rect 5352 2979 5416 3155
 << metal2 >>
 rect -4794 5148 -4734 5152
 rect -4802 5144 -4734 5148
@@ -1192,8 +1218,8 @@
 rect -4730 4872 -4674 4882
 rect 979 4879 6229 5029
 rect 979 4558 1148 4879
-rect -4425 4408 1148 4558
-rect -4425 3829 -4275 4408
+rect -4067 4408 1148 4558
+rect -4067 3864 -3917 4408
 rect 4946 4016 5118 4026
 rect 4946 3920 5118 3930
 rect 6079 3959 6229 4879
@@ -1204,85 +1230,95 @@
 rect 6220 3874 6233 3875
 rect 6079 3850 6233 3874
 rect 6151 3847 6233 3850
-rect -4425 3751 -4420 3829
-rect -4420 3733 -4275 3743
+rect -4067 3704 -3917 3714
 rect 4254 3660 4340 3670
-rect -39 2955 -3 3624
+rect 3 3624 105 3660
+rect -39 3157 105 3624
 rect 4163 3574 4254 3660
-rect 4254 3564 4340 3574
+rect 4197 3564 4340 3574
+rect -39 2959 -37 3157
+rect 76 2959 104 3157
+rect 4197 3112 4283 3564
 rect 4499 3314 4555 3753
 rect 4499 3258 6895 3314
+rect 5352 3155 5416 3165
+rect 4197 3026 5352 3112
+rect 5352 2969 5416 2979
+rect -39 2952 104 2959
+rect -37 2949 76 2952
 rect -4824 2910 -4764 2912
 rect -4836 2909 -4764 2910
-rect -99 2911 -39 2923
+rect -109 2911 20 2915
+rect -109 2909 -99 2911
 rect -4836 2902 -99 2909
 rect -4836 2848 -4824 2902
 rect -4764 2857 -99 2902
-rect -4764 2853 -39 2857
+rect 14 2857 20 2911
+rect -4764 2854 20 2857
+rect -4764 2853 -99 2854
 rect -4824 2838 -4764 2848
-rect -99 2847 -39 2853
-use sky130_fd_pr__nfet_01v8_ZE46K8  sky130_fd_pr__nfet_01v8_ZE46K8_0
-timestamp 1608322001
-transform -1 0 -64 0 -1 3056
-box -211 -319 211 319
+use sky130_fd_pr__nfet_01v8_X8MMG7  sky130_fd_pr__nfet_01v8_X8MMG7_0
+timestamp 1608352057
+transform -1 0 -64 0 -1 3066
+box -211 -329 211 329
 use via_li_m1  via_li_m1_1
 array 0 19 72 0 0 74
-timestamp 1607692587
+timestamp 1606675505
 transform 1 0 -4942 0 1 2536
 box 4 0 76 74
 use via_li_m1  via_li_m1_0
 array 0 19 72 0 0 74
-timestamp 1607692587
+timestamp 1606675505
 transform 1 0 -4942 0 1 2636
 box 4 0 76 74
 use sky130_fd_pr__nfet_01v8_YK3456  sky130_fd_pr__nfet_01v8_YK3456_0
 timestamp 1608249442
 transform -1 0 -4795 0 -1 3024
 box -211 -300 211 300
+use sky130_fd_pr__nfet_01v8_8GKXY7  sky130_fd_pr__nfet_01v8_8GKXY7_0
+timestamp 1608351071
+transform 1 0 6580 0 1 3561
+box -211 -208 211 208
+use sky130_fd_pr__pfet_01v8_5UMBUD  sky130_fd_pr__pfet_01v8_5UMBUD_0
+timestamp 1608350919
+transform 1 0 6580 0 1 4245
+box -211 -298 211 298
 use via_li_m1  via_li_m1_4
 array 0 13 72 0 0 74
-timestamp 1607692587
+timestamp 1606675505
 transform 1 0 5705 0 1 3141
 box 4 0 76 74
 use sky130_fd_pr__nfet_01v8_R7545W  sky130_fd_pr__nfet_01v8_R7545W_0
 timestamp 1608229183
 transform 1 0 5788 0 1 3563
 box -211 -330 211 330
-use sky130_fd_pr__nfet_01v8_9TXQ83  sky130_fd_pr__nfet_01v8_9TXQ83_1
-timestamp 1608229483
-transform 1 0 6580 0 1 3579
-box -211 -264 211 264
-use sky130_fd_pr__pfet_01v8_373K6R  sky130_fd_pr__pfet_01v8_373K6R_0
-timestamp 1608255150
-transform 1 0 6580 0 1 4274
-box -211 -327 211 327
-use sky130_fd_pr__pfet_01v8_3FZUWK  sky130_fd_pr__pfet_01v8_3FZUWK_0
-timestamp 1608254796
-transform 1 0 5788 0 1 4431
-box -211 -436 211 459
 use inverter  inverter_1
-array 0 19 430 0 0 936
-timestamp 1608336920
-transform 1 0 935 0 1 3178
+array 0 18 430 0 0 936
+timestamp 1608352248
+transform 1 0 1365 0 1 3178
 box -5252 188 -4822 1124
-use sky130_fd_pr__pfet_01v8_35M7SP  sky130_fd_pr__pfet_01v8_35M7SP_0
-timestamp 1608253040
-transform 1 0 -4755 0 1 4963
-box -211 -309 211 309
-use sky130_fd_pr__pfet_01v8_3DPBUK  sky130_fd_pr__pfet_01v8_3DPBUK_0
-timestamp 1608330103
-transform 1 0 -58 0 1 4899
-box -211 -242 211 369
+use sky130_fd_pr__pfet_01v8_5U9U2E  sky130_fd_pr__pfet_01v8_5U9U2E_0
+timestamp 1608350448
+transform 1 0 5761 0 1 4476
+box -263 -369 263 369
 use via_li_m1  via_li_m1_3
 array 0 19 72 0 0 74
-timestamp 1607692587
+timestamp 1606675505
 transform 1 0 -4914 0 1 5286
 box 4 0 76 74
 use via_li_m1  via_li_m1_2
 array 0 19 72 0 0 74
-timestamp 1607692587
+timestamp 1606675505
 transform 1 0 -4906 0 1 5386
 box 4 0 76 74
+use sky130_fd_pr__pfet_01v8_JRPBUD  sky130_fd_pr__pfet_01v8_JRPBUD_0
+timestamp 1608343268
+transform 1 0 -57 0 1 4935
+box -211 -334 211 334
+use sky130_fd_pr__pfet_01v8_35M7SP  sky130_fd_pr__pfet_01v8_35M7SP_0
+timestamp 1608253040
+transform 1 0 -4755 0 1 4963
+box -211 -309 211 309
 use nand  nand_0
 timestamp 1608325973
 transform 1 0 4710 0 1 4083
@@ -1293,8 +1329,8 @@
 rlabel metal2 -4734 5086 -93 5144 1 5
 rlabel metal2 -4764 2853 -99 2909 1 in
 rlabel space -32 4122 135 5035 1 10
-rlabel space 204 2714 379 3510 1 9
 rlabel space 5815 3891 6246 3927 1 out_ring
 rlabel metal1 6607 3891 6897 3925 1 out_vco
 rlabel metal2 4499 3258 6895 3314 1 en
+rlabel space 204 2714 379 3510 1 9
 << end >>
diff --git a/mag/ring_vco.spice b/mag/ring_vco.spice
new file mode 100644
index 0000000..63c8a14
--- /dev/null
+++ b/mag/ring_vco.spice
@@ -0,0 +1,122 @@
+* NGSPICE file created from ring_vco.ext - technology: sky130A
+
+.subckt sky130_fd_pr__pfet_01v8_5UMBUD VSUBS a_n73_n150# w_n211_n298# a_n15_n176#
++ a_15_n150#
+X0 a_15_n150# a_n15_n176# a_n73_n150# w_n211_n298# sky130_fd_pr__pfet_01v8 w=1.5e+06u l=150000u
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_YK3456 VSUBS w_n211_n300# a_n33_112# a_n73_n90# a_15_n90#
+X0 a_15_n90# a_n33_112# a_n73_n90# VSUBS sky130_fd_pr__nfet_01v8 w=900000u l=150000u
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_PUCP6T VSUBS a_n73_n45# a_n15_n71# a_15_n45# w_n211_n255#
+X0 a_15_n45# a_n15_n71# a_n73_n45# VSUBS sky130_fd_pr__nfet_01v8 w=450000u l=150000u
+.ends
+
+.subckt sky130_fd_pr__pfet_01v8_35M7SK VSUBS w_n211_n128# a_n73_n90# a_n15_n126# a_15_n90#
+X0 a_15_n90# a_n15_n126# a_n73_n90# w_n211_n128# sky130_fd_pr__pfet_01v8 w=900000u l=150000u
+.ends
+
+.subckt inverter VSUBS m1_n5252_228# m1_n5006_373# m1_n5252_944# w_n5252_188# m1_n5132_408#
++ w_n5252_694# a_n5180_576#
+Xinv_nfet VSUBS m1_n5132_408# a_n5180_576# m1_n5006_373# VSUBS sky130_fd_pr__nfet_01v8_PUCP6T
+Xsky130_fd_pr__pfet_01v8_35M7SK_0 VSUBS w_n5252_694# m1_n5252_944# a_n5180_576# m1_n5006_373#
++ sky130_fd_pr__pfet_01v8_35M7SK
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_X8MMG7 VSUBS a_15_n181# a_n33_141# a_n73_n181# w_n211_n329#
+X0 a_15_n181# a_n33_141# a_n73_n181# VSUBS sky130_fd_pr__nfet_01v8 w=1.5e+06u l=150000u
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_8GKXY7 VSUBS a_n73_n60# a_n15_n86# a_15_n60# w_n211_n208#
+X0 a_15_n60# a_n15_n86# a_n73_n60# VSUBS sky130_fd_pr__nfet_01v8 w=600000u l=150000u
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_TFZGL8 VSUBS a_n81_n133# w_n263_n255# a_15_67# a_n125_n45#
++ a_63_n45#
+X0 a_63_n45# a_15_67# a_n33_n45# VSUBS sky130_fd_pr__nfet_01v8 w=450000u l=150000u
+X1 a_n33_n45# a_n81_n133# a_n125_n45# VSUBS sky130_fd_pr__nfet_01v8 w=450000u l=150000u
+.ends
+
+.subckt sky130_fd_pr__pfet_01v8_H49BFK VSUBS a_n125_n90# a_63_n90# a_n33_n90# a_n81_n187#
++ w_n263_n309# a_15_121#
+X0 a_n33_n90# a_n81_n187# a_n125_n90# w_n263_n309# sky130_fd_pr__pfet_01v8 w=900000u l=150000u
+X1 a_63_n90# a_15_121# a_n33_n90# w_n263_n309# sky130_fd_pr__pfet_01v8 w=900000u l=150000u
+.ends
+
+.subckt nand out bulk_n m1_n267_n447# vdd A B
+Xsky130_fd_pr__nfet_01v8_TFZGL8_0 bulk_n B bulk_n A m1_n267_n447# out sky130_fd_pr__nfet_01v8_TFZGL8
+Xsky130_fd_pr__pfet_01v8_H49BFK_0 bulk_n out out vdd B vdd A sky130_fd_pr__pfet_01v8_H49BFK
+.ends
+
+.subckt sky130_fd_pr__pfet_01v8_5U9U2E VSUBS a_n125_n150# a_33_n176# w_n263_n369#
++ a_n33_n150# a_n63_n176# a_63_n150#
+X0 a_63_n150# a_33_n176# a_n33_n150# w_n263_n369# sky130_fd_pr__pfet_01v8 w=1.5e+06u l=150000u
+X1 a_n33_n150# a_n63_n176# a_n125_n150# w_n263_n369# sky130_fd_pr__pfet_01v8 w=1.5e+06u l=150000u
+.ends
+
+.subckt sky130_fd_pr__pfet_01v8_35M7SP VSUBS a_n73_n90# a_n33_121# a_15_n90# w_n211_n309#
+X0 a_15_n90# a_n33_121# a_n73_n90# w_n211_n309# sky130_fd_pr__pfet_01v8 w=900000u l=150000u
+.ends
+
+.subckt sky130_fd_pr__pfet_01v8_JRPBUD VSUBS a_15_n186# w_n211_n334# a_n33_145# a_n73_n186#
+X0 a_15_n186# a_n33_145# a_n73_n186# w_n211_n334# sky130_fd_pr__pfet_01v8 w=1.5e+06u l=150000u
+.ends
+
+.subckt sky130_fd_pr__nfet_01v8_R7545W VSUBS w_n211_n330# a_15_n120# a_n73_n120# a_n15_n207#
+X0 a_15_n120# a_n15_n207# a_n73_n120# VSUBS sky130_fd_pr__nfet_01v8 w=1.2e+06u l=150000u
+.ends
+
+
+* Top level circuit ring_vco
+
+Xsky130_fd_pr__pfet_01v8_5UMBUD_0 vss vdd vdd a_6167_3877# out_vco sky130_fd_pr__pfet_01v8_5UMBUD
+Xsky130_fd_pr__nfet_01v8_YK3456_0 vss vss in 5 vss sky130_fd_pr__nfet_01v8_YK3456
+Xinverter_1[0] vss vss inverter_1[1]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ a_6167_3877# inverter
+Xinverter_1[1] vss vss inverter_1[2]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[1]/a_n5180_576# inverter
+Xinverter_1[2] vss vss inverter_1[3]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[2]/a_n5180_576# inverter
+Xinverter_1[3] vss vss inverter_1[4]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[3]/a_n5180_576# inverter
+Xinverter_1[4] vss vss inverter_1[5]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[4]/a_n5180_576# inverter
+Xinverter_1[5] vss vss inverter_1[6]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[5]/a_n5180_576# inverter
+Xinverter_1[6] vss vss inverter_1[7]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[6]/a_n5180_576# inverter
+Xinverter_1[7] vss vss inverter_1[8]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[7]/a_n5180_576# inverter
+Xinverter_1[8] vss vss inverter_1[9]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[8]/a_n5180_576# inverter
+Xinverter_1[9] vss vss inverter_1[9]/m1_n5006_373# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[9]/a_n5180_576# inverter
+Xinverter_1[10] vss vss inverter_1[11]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[9]/m1_n5006_373# inverter
+Xinverter_1[11] vss vss inverter_1[12]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[11]/a_n5180_576# inverter
+Xinverter_1[12] vss vss inverter_1[13]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[12]/a_n5180_576# inverter
+Xinverter_1[13] vss vss inverter_1[14]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[13]/a_n5180_576# inverter
+Xinverter_1[14] vss vss inverter_1[15]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[14]/a_n5180_576# inverter
+Xinverter_1[15] vss vss inverter_1[16]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[15]/a_n5180_576# inverter
+Xinverter_1[16] vss vss inverter_1[17]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[16]/a_n5180_576# inverter
+Xinverter_1[17] vss vss inverter_1[18]/a_n5180_576# nand_0/vdd vss m1_n47_2959# nand_0/vdd
++ inverter_1[17]/a_n5180_576# inverter
+Xinverter_1[18] vss vss nand_0/A nand_0/vdd vss m1_n47_2959# nand_0/vdd inverter_1[18]/a_n5180_576#
++ inverter
+Xsky130_fd_pr__nfet_01v8_X8MMG7_0 vss vss in m1_n47_2959# vss sky130_fd_pr__nfet_01v8_X8MMG7
+Xsky130_fd_pr__nfet_01v8_8GKXY7_0 vss vss a_6167_3877# out_vco vss sky130_fd_pr__nfet_01v8_8GKXY7
+Xnand_0 nand_0/out vss m1_n47_2959# nand_0/vdd nand_0/A en nand
+Xsky130_fd_pr__pfet_01v8_5U9U2E_0 vss a_6167_3877# nand_0/out nand_0/vdd nand_0/vdd
++ nand_0/out a_6167_3877# sky130_fd_pr__pfet_01v8_5U9U2E
+Xsky130_fd_pr__pfet_01v8_35M7SP_0 vss vdd 5 5 vdd sky130_fd_pr__pfet_01v8_35M7SP
+Xsky130_fd_pr__pfet_01v8_JRPBUD_0 vss nand_0/vdd vdd 5 vdd sky130_fd_pr__pfet_01v8_JRPBUD
+Xsky130_fd_pr__nfet_01v8_R7545W_0 vss vss a_6167_3877# m1_n47_2959# nand_0/out sky130_fd_pr__nfet_01v8_R7545W
+.end
+
diff --git a/mag/sky130_fd_pr__nfet_01v8_4C5U47.mag b/mag/sky130_fd_pr__nfet_01v8_4C5U47.mag
new file mode 100644
index 0000000..5006866
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_4C5U47.mag
@@ -0,0 +1,85 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608352057
+<< error_p >>
+rect -29 -157 29 -151
+rect -29 -191 -17 -157
+rect -29 -197 29 -191
+<< pwell >>
+rect -211 -329 211 329
+<< nmos >>
+rect -15 -119 15 181
+<< ndiff >>
+rect -73 169 -15 181
+rect -73 -107 -61 169
+rect -27 -107 -15 169
+rect -73 -119 -15 -107
+rect 15 169 73 181
+rect 15 -107 27 169
+rect 61 -107 73 169
+rect 15 -119 73 -107
+<< ndiffc >>
+rect -61 -107 -27 169
+rect 27 -107 61 169
+<< psubdiff >>
+rect -175 259 -79 293
+rect 79 259 175 293
+rect -175 197 -141 259
+rect 141 197 175 259
+rect -175 -259 -141 -197
+rect 141 -259 175 -197
+rect -175 -293 -79 -259
+rect 79 -293 175 -259
+<< psubdiffcont >>
+rect -79 259 79 293
+rect -175 -197 -141 197
+rect 141 -197 175 197
+rect -79 -293 79 -259
+<< poly >>
+rect -15 181 15 207
+rect -15 -141 15 -119
+rect -33 -157 33 -141
+rect -33 -191 -17 -157
+rect 17 -191 33 -157
+rect -33 -207 33 -191
+<< polycont >>
+rect -17 -191 17 -157
+<< locali >>
+rect -175 259 -79 293
+rect 79 259 175 293
+rect -175 197 -141 259
+rect 141 197 175 259
+rect -61 169 -27 185
+rect -61 -123 -27 -107
+rect 27 169 61 185
+rect 27 -123 61 -107
+rect -33 -191 -17 -157
+rect 17 -191 33 -157
+rect -175 -259 -141 -197
+rect 141 -259 175 -197
+rect -175 -293 -79 -259
+rect 79 -293 175 -259
+<< viali >>
+rect -61 -107 -27 169
+rect 27 -107 61 169
+rect -17 -191 17 -157
+<< metal1 >>
+rect -67 169 -21 181
+rect -67 -107 -61 169
+rect -27 -107 -21 169
+rect -67 -119 -21 -107
+rect 21 169 67 181
+rect 21 -107 27 169
+rect 61 -107 67 169
+rect 21 -119 67 -107
+rect -29 -157 29 -151
+rect -29 -191 -17 -157
+rect 17 -191 29 -157
+rect -29 -197 29 -191
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -276 158 276
+string parameters w 1.5 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_8GKXY7.mag b/mag/sky130_fd_pr__nfet_01v8_8GKXY7.mag
new file mode 100644
index 0000000..50d3391
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_8GKXY7.mag
@@ -0,0 +1,64 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608351071
+<< pwell >>
+rect -211 -208 211 208
+<< nmos >>
+rect -15 -60 15 60
+<< ndiff >>
+rect -73 48 -15 60
+rect -73 -48 -61 48
+rect -27 -48 -15 48
+rect -73 -60 -15 -48
+rect 15 48 73 60
+rect 15 -48 27 48
+rect 61 -48 73 48
+rect 15 -60 73 -48
+<< ndiffc >>
+rect -61 -48 -27 48
+rect 27 -48 61 48
+<< psubdiff >>
+rect -175 76 -141 138
+rect 141 76 175 138
+rect -175 -138 -141 -76
+rect 141 -138 175 -76
+rect -175 -172 -79 -138
+rect 79 -172 175 -138
+<< psubdiffcont >>
+rect -175 -76 -141 76
+rect 141 -76 175 76
+rect -79 -172 79 -138
+<< poly >>
+rect -15 60 15 86
+rect -15 -86 15 -60
+<< locali >>
+rect -175 138 175 172
+rect -175 76 -141 138
+rect 141 76 175 138
+rect -61 48 -27 64
+rect -61 -64 -27 -48
+rect 27 48 61 64
+rect 27 -64 61 -48
+rect -175 -138 -141 -76
+rect 141 -138 175 -76
+rect -175 -172 -79 -138
+rect 79 -172 175 -138
+<< viali >>
+rect -61 -48 -27 48
+rect 27 -48 61 48
+<< metal1 >>
+rect -67 48 -21 60
+rect -67 -48 -61 48
+rect -27 -48 -21 48
+rect -67 -60 -21 -48
+rect 21 48 67 60
+rect 21 -48 27 48
+rect 61 -48 67 48
+rect 21 -60 67 -48
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -155 158 155
+string parameters w 0.6 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 0 gbc 1 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_AS945W.mag b/mag/sky130_fd_pr__nfet_01v8_AS945W.mag
new file mode 100644
index 0000000..17734f0
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_AS945W.mag
@@ -0,0 +1,100 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608351055
+<< error_p >>
+rect -29 132 29 138
+rect -29 98 -17 132
+rect -29 92 29 98
+rect -29 -98 29 -92
+rect -29 -132 -17 -98
+rect -29 -138 29 -132
+<< pwell >>
+rect -211 -270 211 270
+<< nmos >>
+rect -15 -60 15 60
+<< ndiff >>
+rect -73 48 -15 60
+rect -73 -48 -61 48
+rect -27 -48 -15 48
+rect -73 -60 -15 -48
+rect 15 48 73 60
+rect 15 -48 27 48
+rect 61 -48 73 48
+rect 15 -60 73 -48
+<< ndiffc >>
+rect -61 -48 -27 48
+rect 27 -48 61 48
+<< psubdiff >>
+rect -175 200 -79 234
+rect 79 200 175 234
+rect -175 138 -141 200
+rect 141 138 175 200
+rect -175 -200 -141 -138
+rect 141 -200 175 -138
+rect -175 -234 -79 -200
+rect 79 -234 175 -200
+<< psubdiffcont >>
+rect -79 200 79 234
+rect -175 -138 -141 138
+rect 141 -138 175 138
+rect -79 -234 79 -200
+<< poly >>
+rect -33 132 33 148
+rect -33 98 -17 132
+rect 17 98 33 132
+rect -33 82 33 98
+rect -15 60 15 82
+rect -15 -82 15 -60
+rect -33 -98 33 -82
+rect -33 -132 -17 -98
+rect 17 -132 33 -98
+rect -33 -148 33 -132
+<< polycont >>
+rect -17 98 17 132
+rect -17 -132 17 -98
+<< locali >>
+rect -175 200 -79 234
+rect 79 200 175 234
+rect -175 138 -141 200
+rect 141 138 175 200
+rect -33 98 -17 132
+rect 17 98 33 132
+rect -61 48 -27 64
+rect -61 -64 -27 -48
+rect 27 48 61 64
+rect 27 -64 61 -48
+rect -33 -132 -17 -98
+rect 17 -132 33 -98
+rect -175 -200 -141 -138
+rect 141 -200 175 -138
+rect -175 -234 -79 -200
+rect 79 -234 175 -200
+<< viali >>
+rect -17 98 17 132
+rect -61 -48 -27 48
+rect 27 -48 61 48
+rect -17 -132 17 -98
+<< metal1 >>
+rect -29 132 29 138
+rect -29 98 -17 132
+rect 17 98 29 132
+rect -29 92 29 98
+rect -67 48 -21 60
+rect -67 -48 -61 48
+rect -27 -48 -21 48
+rect -67 -60 -21 -48
+rect 21 48 67 60
+rect 21 -48 27 48
+rect 61 -48 67 48
+rect 21 -60 67 -48
+rect -29 -98 29 -92
+rect -29 -132 -17 -98
+rect 17 -132 29 -98
+rect -29 -138 29 -132
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -217 158 217
+string parameters w 0.6 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_X85456.mag b/mag/sky130_fd_pr__nfet_01v8_X85456.mag
new file mode 100644
index 0000000..05bd966
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_X85456.mag
@@ -0,0 +1,100 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608352057
+<< error_p >>
+rect -29 222 29 228
+rect -29 188 -17 222
+rect -29 182 29 188
+rect -29 -188 29 -182
+rect -29 -222 -17 -188
+rect -29 -228 29 -222
+<< pwell >>
+rect -211 -360 211 360
+<< nmos >>
+rect -15 -150 15 150
+<< ndiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< ndiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< psubdiff >>
+rect -175 290 -79 324
+rect 79 290 175 324
+rect -175 228 -141 290
+rect 141 228 175 290
+rect -175 -290 -141 -228
+rect 141 -290 175 -228
+rect -175 -324 -79 -290
+rect 79 -324 175 -290
+<< psubdiffcont >>
+rect -79 290 79 324
+rect -175 -228 -141 228
+rect 141 -228 175 228
+rect -79 -324 79 -290
+<< poly >>
+rect -33 222 33 238
+rect -33 188 -17 222
+rect 17 188 33 222
+rect -33 172 33 188
+rect -15 150 15 172
+rect -15 -172 15 -150
+rect -33 -188 33 -172
+rect -33 -222 -17 -188
+rect 17 -222 33 -188
+rect -33 -238 33 -222
+<< polycont >>
+rect -17 188 17 222
+rect -17 -222 17 -188
+<< locali >>
+rect -175 290 -79 324
+rect 79 290 175 324
+rect -175 228 -141 290
+rect 141 228 175 290
+rect -33 188 -17 222
+rect 17 188 33 222
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -33 -222 -17 -188
+rect 17 -222 33 -188
+rect -175 -290 -141 -228
+rect 141 -290 175 -228
+rect -175 -324 -79 -290
+rect 79 -324 175 -290
+<< viali >>
+rect -17 188 17 222
+rect -61 -138 -27 138
+rect 27 -138 61 138
+rect -17 -222 17 -188
+<< metal1 >>
+rect -29 222 29 228
+rect -29 188 -17 222
+rect 17 188 29 222
+rect -29 182 29 188
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+rect -29 -188 29 -182
+rect -29 -222 -17 -188
+rect 17 -222 29 -188
+rect -29 -228 29 -222
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -307 158 307
+string parameters w 1.5 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_01v8_X8MMG7.mag b/mag/sky130_fd_pr__nfet_01v8_X8MMG7.mag
new file mode 100644
index 0000000..cf1a970
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_01v8_X8MMG7.mag
@@ -0,0 +1,85 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608352057
+<< error_p >>
+rect -29 191 29 197
+rect -29 157 -17 191
+rect -29 151 29 157
+<< pwell >>
+rect -211 -329 211 329
+<< nmos >>
+rect -15 -181 15 119
+<< ndiff >>
+rect -73 107 -15 119
+rect -73 -169 -61 107
+rect -27 -169 -15 107
+rect -73 -181 -15 -169
+rect 15 107 73 119
+rect 15 -169 27 107
+rect 61 -169 73 107
+rect 15 -181 73 -169
+<< ndiffc >>
+rect -61 -169 -27 107
+rect 27 -169 61 107
+<< psubdiff >>
+rect -175 259 -79 293
+rect 79 259 175 293
+rect -175 197 -141 259
+rect 141 197 175 259
+rect -175 -259 -141 -197
+rect 141 -259 175 -197
+rect -175 -293 -79 -259
+rect 79 -293 175 -259
+<< psubdiffcont >>
+rect -79 259 79 293
+rect -175 -197 -141 197
+rect 141 -197 175 197
+rect -79 -293 79 -259
+<< poly >>
+rect -33 191 33 207
+rect -33 157 -17 191
+rect 17 157 33 191
+rect -33 141 33 157
+rect -15 119 15 141
+rect -15 -207 15 -181
+<< polycont >>
+rect -17 157 17 191
+<< locali >>
+rect -175 259 -79 293
+rect 79 259 175 293
+rect -175 197 -141 259
+rect 141 197 175 259
+rect -33 157 -17 191
+rect 17 157 33 191
+rect -61 107 -27 123
+rect -61 -185 -27 -169
+rect 27 107 61 123
+rect 27 -185 61 -169
+rect -175 -259 -141 -197
+rect 141 -259 175 -197
+rect -175 -293 -79 -259
+rect 79 -293 175 -259
+<< viali >>
+rect -17 157 17 191
+rect -61 -169 -27 107
+rect 27 -169 61 107
+<< metal1 >>
+rect -29 191 29 197
+rect -29 157 -17 191
+rect 17 157 29 191
+rect -29 151 29 157
+rect -67 107 -21 119
+rect -67 -169 -61 107
+rect -27 -169 -21 107
+rect -67 -181 -21 -169
+rect 21 107 67 119
+rect 21 -169 27 107
+rect 61 -169 67 107
+rect 21 -181 67 -169
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -276 158 276
+string parameters w 1.5 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_3DBU2L.mag b/mag/sky130_fd_pr__pfet_01v8_3DBU2L.mag
new file mode 100644
index 0000000..37d70fd
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_3DBU2L.mag
@@ -0,0 +1,115 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350448
+<< error_p >>
+rect 19 231 77 237
+rect 19 197 31 231
+rect 19 191 77 197
+rect -77 -197 -19 -191
+rect -77 -231 -65 -197
+rect -77 -237 -19 -231
+<< nwell >>
+rect -263 -369 263 369
+<< pmos >>
+rect -63 -150 -33 150
+rect 33 -150 63 150
+<< pdiff >>
+rect -125 138 -63 150
+rect -125 -138 -113 138
+rect -79 -138 -63 138
+rect -125 -150 -63 -138
+rect -33 138 33 150
+rect -33 -138 -17 138
+rect 17 -138 33 138
+rect -33 -150 33 -138
+rect 63 138 125 150
+rect 63 -138 79 138
+rect 113 -138 125 138
+rect 63 -150 125 -138
+<< pdiffc >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< nsubdiff >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 -131 -299
+rect 131 -333 227 -299
+<< nsubdiffcont >>
+rect -131 299 131 333
+rect -227 -237 -193 237
+rect 193 -237 227 237
+rect -131 -333 131 -299
+<< poly >>
+rect 15 231 81 247
+rect 15 197 31 231
+rect 65 197 81 231
+rect 15 181 81 197
+rect -63 150 -33 176
+rect 33 150 63 181
+rect -63 -181 -33 -150
+rect 33 -176 63 -150
+rect -81 -197 -15 -181
+rect -81 -231 -65 -197
+rect -31 -231 -15 -197
+rect -81 -247 -15 -231
+<< polycont >>
+rect 31 197 65 231
+rect -65 -231 -31 -197
+<< locali >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect 15 197 31 231
+rect 65 197 81 231
+rect -113 138 -79 154
+rect -113 -154 -79 -138
+rect -17 138 17 154
+rect -17 -154 17 -138
+rect 79 138 113 154
+rect 79 -154 113 -138
+rect -81 -231 -65 -197
+rect -31 -231 -15 -197
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 -131 -299
+rect 131 -333 227 -299
+<< viali >>
+rect 31 197 65 231
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+rect -65 -231 -31 -197
+<< metal1 >>
+rect 19 231 77 237
+rect 19 197 31 231
+rect 65 197 77 231
+rect 19 191 77 197
+rect -119 138 -73 150
+rect -119 -138 -113 138
+rect -79 -138 -73 138
+rect -119 -150 -73 -138
+rect -23 138 23 150
+rect -23 -138 -17 138
+rect 17 -138 23 138
+rect -23 -150 23 -138
+rect 73 138 119 150
+rect 73 -138 79 138
+rect 113 -138 119 138
+rect 73 -150 119 -138
+rect -77 -197 -19 -191
+rect -77 -231 -65 -197
+rect -31 -231 -19 -197
+rect -77 -237 -19 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -210 -316 210 316
+string parameters w 1.5 l 0.15 m 1 nf 2 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_5U9U2E.mag b/mag/sky130_fd_pr__pfet_01v8_5U9U2E.mag
new file mode 100644
index 0000000..7c1238d
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_5U9U2E.mag
@@ -0,0 +1,78 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350448
+<< nwell >>
+rect -263 -369 263 369
+<< pmos >>
+rect -63 -150 -33 150
+rect 33 -150 63 150
+<< pdiff >>
+rect -125 138 -63 150
+rect -125 -138 -113 138
+rect -79 -138 -63 138
+rect -125 -150 -63 -138
+rect -33 138 33 150
+rect -33 -138 -17 138
+rect 17 -138 33 138
+rect -33 -150 33 -138
+rect 63 138 125 150
+rect 63 -138 79 138
+rect 113 -138 125 138
+rect 63 -150 125 -138
+<< pdiffc >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< nsubdiff >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+<< nsubdiffcont >>
+rect -131 299 131 333
+rect -227 -237 -193 237
+rect 193 -237 227 237
+<< poly >>
+rect -63 150 -33 176
+rect 33 150 63 176
+rect -63 -176 -33 -150
+rect 33 -176 63 -150
+<< locali >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -113 138 -79 154
+rect -113 -154 -79 -138
+rect -17 138 17 154
+rect -17 -154 17 -138
+rect 79 138 113 154
+rect 79 -154 113 -138
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+<< viali >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< metal1 >>
+rect -119 138 -73 150
+rect -119 -138 -113 138
+rect -79 -138 -73 138
+rect -119 -150 -73 -138
+rect -23 138 23 150
+rect -23 -138 -17 138
+rect 17 -138 23 138
+rect -23 -150 23 -138
+rect 73 138 119 150
+rect 73 -138 79 138
+rect 113 -138 119 138
+rect 73 -150 119 -138
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -210 -316 210 316
+string parameters w 1.5 l 0.15 m 1 nf 2 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_5UMBUD.mag b/mag/sky130_fd_pr__pfet_01v8_5UMBUD.mag
new file mode 100644
index 0000000..fcad5f2
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_5UMBUD.mag
@@ -0,0 +1,64 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350919
+<< nwell >>
+rect -211 -298 211 298
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< nsubdiff >>
+rect -175 228 -79 262
+rect 79 228 175 262
+rect -175 166 -141 228
+rect 141 166 175 228
+rect -175 -228 -141 -166
+rect 141 -228 175 -166
+<< nsubdiffcont >>
+rect -79 228 79 262
+rect -175 -166 -141 166
+rect 141 -166 175 166
+<< poly >>
+rect -15 150 15 176
+rect -15 -176 15 -150
+<< locali >>
+rect -175 228 -79 262
+rect 79 228 175 262
+rect -175 166 -141 228
+rect 141 166 175 228
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -175 -228 -141 -166
+rect 141 -228 175 -166
+rect -175 -262 175 -228
+<< viali >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< metal1 >>
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -245 158 245
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_6Z4FRM.mag b/mag/sky130_fd_pr__pfet_01v8_6Z4FRM.mag
new file mode 100644
index 0000000..378c627
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_6Z4FRM.mag
@@ -0,0 +1,68 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350876
+<< nwell >>
+rect -211 -298 211 298
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< nsubdiff >>
+rect -175 228 -79 262
+rect 79 228 175 262
+rect -175 166 -141 228
+rect 141 166 175 228
+rect -175 -228 -141 -166
+rect 141 -228 175 -166
+rect -175 -262 -79 -228
+rect 79 -262 175 -228
+<< nsubdiffcont >>
+rect -79 228 79 262
+rect -175 -166 -141 166
+rect 141 -166 175 166
+rect -79 -262 79 -228
+<< poly >>
+rect -15 150 15 176
+rect -15 -176 15 -150
+<< locali >>
+rect -175 228 -79 262
+rect 79 228 175 262
+rect -175 166 -141 228
+rect 141 166 175 228
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -175 -228 -141 -166
+rect 141 -228 175 -166
+rect -175 -262 -79 -228
+rect 79 -262 175 -228
+<< viali >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< metal1 >>
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -245 158 245
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_6ZQU2N.mag b/mag/sky130_fd_pr__pfet_01v8_6ZQU2N.mag
new file mode 100644
index 0000000..906e765
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_6ZQU2N.mag
@@ -0,0 +1,83 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350448
+<< nwell >>
+rect -263 -369 263 369
+<< pmos >>
+rect -63 -150 -33 150
+rect 33 -150 63 150
+<< pdiff >>
+rect -125 138 -63 150
+rect -125 -138 -113 138
+rect -79 -138 -63 138
+rect -125 -150 -63 -138
+rect -33 138 33 150
+rect -33 -138 -17 138
+rect 17 -138 33 138
+rect -33 -150 33 -138
+rect 63 138 125 150
+rect 63 -138 79 138
+rect 113 -138 125 138
+rect 63 -150 125 -138
+<< pdiffc >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< nsubdiff >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 -131 -299
+rect 131 -333 227 -299
+<< nsubdiffcont >>
+rect -131 299 131 333
+rect -227 -237 -193 237
+rect 193 -237 227 237
+rect -131 -333 131 -299
+<< poly >>
+rect -63 150 -33 176
+rect 33 150 63 181
+rect -63 -181 -33 -150
+rect 33 -176 63 -150
+<< locali >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -113 138 -79 154
+rect -113 -154 -79 -138
+rect -17 138 17 154
+rect -17 -154 17 -138
+rect 79 138 113 154
+rect 79 -154 113 -138
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 -131 -299
+rect 131 -333 227 -299
+<< viali >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< metal1 >>
+rect -119 138 -73 150
+rect -119 -138 -113 138
+rect -79 -138 -73 138
+rect -119 -150 -73 -138
+rect -23 138 23 150
+rect -23 -138 -17 138
+rect 17 -138 23 138
+rect -23 -150 23 -138
+rect 73 138 119 150
+rect 73 -138 79 138
+rect 113 -138 119 138
+rect 73 -150 119 -138
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -210 -316 210 316
+string parameters w 1.5 l 0.15 m 1 nf 2 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_BDBLWB.mag b/mag/sky130_fd_pr__pfet_01v8_BDBLWB.mag
new file mode 100644
index 0000000..1d31f86
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_BDBLWB.mag
@@ -0,0 +1,124 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350448
+<< error_p >>
+rect 76 231 134 237
+rect 76 197 88 231
+rect 76 191 134 197
+rect -134 -197 -76 -191
+rect -134 -231 -122 -197
+rect -134 -237 -76 -231
+<< nwell >>
+rect -320 -369 320 369
+<< pmos >>
+rect -120 -150 -90 150
+rect 90 -150 120 150
+<< pdiff >>
+rect -182 138 -120 150
+rect -182 -138 -170 138
+rect -136 -138 -120 138
+rect -182 -150 -120 -138
+rect -90 138 -28 150
+rect -90 -138 -74 138
+rect -40 -138 -28 138
+rect -90 -150 -28 -138
+rect 28 138 90 150
+rect 28 -138 40 138
+rect 74 -138 90 138
+rect 28 -150 90 -138
+rect 120 138 182 150
+rect 120 -138 136 138
+rect 170 -138 182 138
+rect 120 -150 182 -138
+<< pdiffc >>
+rect -170 -138 -136 138
+rect -74 -138 -40 138
+rect 40 -138 74 138
+rect 136 -138 170 138
+<< nsubdiff >>
+rect -284 299 -188 333
+rect 188 299 284 333
+rect -284 237 -250 299
+rect 250 237 284 299
+rect -284 -299 -250 -237
+rect 250 -299 284 -237
+rect -284 -333 284 -299
+<< nsubdiffcont >>
+rect -188 299 188 333
+rect -284 -237 -250 237
+rect 250 -237 284 237
+<< poly >>
+rect 72 231 138 247
+rect 72 197 88 231
+rect 122 197 138 231
+rect 72 181 138 197
+rect -120 150 -90 176
+rect 90 150 120 181
+rect -120 -181 -90 -150
+rect 90 -176 120 -150
+rect -138 -197 -72 -181
+rect -138 -231 -122 -197
+rect -88 -231 -72 -197
+rect -138 -247 -72 -231
+<< polycont >>
+rect 88 197 122 231
+rect -122 -231 -88 -197
+<< locali >>
+rect -284 299 -188 333
+rect 188 299 284 333
+rect -284 237 -250 299
+rect 250 237 284 299
+rect 72 197 88 231
+rect 122 197 138 231
+rect -170 138 -136 154
+rect -170 -154 -136 -138
+rect -74 138 -40 154
+rect -74 -154 -40 -138
+rect 40 138 74 154
+rect 40 -154 74 -138
+rect 136 138 170 154
+rect 136 -154 170 -138
+rect -138 -231 -122 -197
+rect -88 -231 -72 -197
+rect -284 -299 -250 -237
+rect 250 -299 284 -237
+rect -284 -333 284 -299
+<< viali >>
+rect 88 197 122 231
+rect -170 -138 -136 138
+rect -74 -138 -40 138
+rect 40 -138 74 138
+rect 136 -138 170 138
+rect -122 -231 -88 -197
+<< metal1 >>
+rect 76 231 134 237
+rect 76 197 88 231
+rect 122 197 134 231
+rect 76 191 134 197
+rect -176 138 -130 150
+rect -176 -138 -170 138
+rect -136 -138 -130 138
+rect -176 -150 -130 -138
+rect -80 138 -34 150
+rect -80 -138 -74 138
+rect -40 -138 -34 138
+rect -80 -150 -34 -138
+rect 34 138 80 150
+rect 34 -138 40 138
+rect 74 -138 80 138
+rect 34 -150 80 -138
+rect 130 138 176 150
+rect 130 -138 136 138
+rect 170 -138 176 138
+rect 130 -150 176 -138
+rect -134 -197 -76 -191
+rect -134 -231 -122 -197
+rect -88 -231 -76 -197
+rect -134 -237 -76 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -267 -316 267 316
+string parameters w 1.5 l 0.15 m 1 nf 2 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 0 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_BDBU2C.mag b/mag/sky130_fd_pr__pfet_01v8_BDBU2C.mag
new file mode 100644
index 0000000..148efd0
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_BDBU2C.mag
@@ -0,0 +1,112 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350448
+<< error_p >>
+rect 19 231 77 237
+rect 19 197 31 231
+rect 19 191 77 197
+rect -77 -197 -19 -191
+rect -77 -231 -65 -197
+rect -77 -237 -19 -231
+<< nwell >>
+rect -263 -369 263 369
+<< pmos >>
+rect -63 -150 -33 150
+rect 33 -150 63 150
+<< pdiff >>
+rect -125 138 -63 150
+rect -125 -138 -113 138
+rect -79 -138 -63 138
+rect -125 -150 -63 -138
+rect -33 138 33 150
+rect -33 -138 -17 138
+rect 17 -138 33 138
+rect -33 -150 33 -138
+rect 63 138 125 150
+rect 63 -138 79 138
+rect 113 -138 125 138
+rect 63 -150 125 -138
+<< pdiffc >>
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+<< nsubdiff >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 227 -299
+<< nsubdiffcont >>
+rect -131 299 131 333
+rect -227 -237 -193 237
+rect 193 -237 227 237
+<< poly >>
+rect 15 231 81 247
+rect 15 197 31 231
+rect 65 197 81 231
+rect 15 181 81 197
+rect -63 150 -33 176
+rect 33 150 63 181
+rect -63 -181 -33 -150
+rect 33 -176 63 -150
+rect -81 -197 -15 -181
+rect -81 -231 -65 -197
+rect -31 -231 -15 -197
+rect -81 -247 -15 -231
+<< polycont >>
+rect 31 197 65 231
+rect -65 -231 -31 -197
+<< locali >>
+rect -227 299 -131 333
+rect 131 299 227 333
+rect -227 237 -193 299
+rect 193 237 227 299
+rect 15 197 31 231
+rect 65 197 81 231
+rect -113 138 -79 154
+rect -113 -154 -79 -138
+rect -17 138 17 154
+rect -17 -154 17 -138
+rect 79 138 113 154
+rect 79 -154 113 -138
+rect -81 -231 -65 -197
+rect -31 -231 -15 -197
+rect -227 -299 -193 -237
+rect 193 -299 227 -237
+rect -227 -333 227 -299
+<< viali >>
+rect 31 197 65 231
+rect -113 -138 -79 138
+rect -17 -138 17 138
+rect 79 -138 113 138
+rect -65 -231 -31 -197
+<< metal1 >>
+rect 19 231 77 237
+rect 19 197 31 231
+rect 65 197 77 231
+rect 19 191 77 197
+rect -119 138 -73 150
+rect -119 -138 -113 138
+rect -79 -138 -73 138
+rect -119 -150 -73 -138
+rect -23 138 23 150
+rect -23 -138 -17 138
+rect 17 -138 23 138
+rect -23 -150 23 -138
+rect 73 138 119 150
+rect 73 -138 79 138
+rect 113 -138 119 138
+rect 73 -150 119 -138
+rect -77 -197 -19 -191
+rect -77 -231 -65 -197
+rect -31 -231 -19 -197
+rect -77 -237 -19 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -210 -316 210 316
+string parameters w 1.5 l 0.15 m 1 nf 2 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_BDPBUB.mag b/mag/sky130_fd_pr__pfet_01v8_BDPBUB.mag
new file mode 100644
index 0000000..b0414cf
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_BDPBUB.mag
@@ -0,0 +1,82 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 -161 29 -155
+rect -29 -195 -17 -161
+rect -29 -201 29 -195
+<< nwell >>
+rect -211 -334 211 334
+<< pmos >>
+rect -15 -114 15 186
+<< pdiff >>
+rect -73 174 -15 186
+rect -73 -102 -61 174
+rect -27 -102 -15 174
+rect -73 -114 -15 -102
+rect 15 174 73 186
+rect 15 -102 27 174
+rect 61 -102 73 174
+rect 15 -114 73 -102
+<< pdiffc >>
+rect -61 -102 -27 174
+rect 27 -102 61 174
+<< nsubdiff >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 175 -264
+<< nsubdiffcont >>
+rect -79 264 79 298
+rect -175 -201 -141 201
+rect 141 -201 175 201
+<< poly >>
+rect -15 186 15 212
+rect -15 -145 15 -114
+rect -33 -161 33 -145
+rect -33 -195 -17 -161
+rect 17 -195 33 -161
+rect -33 -211 33 -195
+<< polycont >>
+rect -17 -195 17 -161
+<< locali >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -61 174 -27 190
+rect -61 -118 -27 -102
+rect 27 174 61 190
+rect 27 -118 61 -102
+rect -33 -195 -17 -161
+rect 17 -195 33 -161
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 175 -264
+<< viali >>
+rect -61 -102 -27 174
+rect 27 -102 61 174
+rect -17 -195 17 -161
+<< metal1 >>
+rect -67 174 -21 186
+rect -67 -102 -61 174
+rect -27 -102 -21 174
+rect -67 -114 -21 -102
+rect 21 174 67 186
+rect 21 -102 27 174
+rect 61 -102 67 174
+rect 21 -114 67 -102
+rect -29 -161 29 -155
+rect -29 -195 -17 -161
+rect 17 -195 29 -161
+rect -29 -201 29 -195
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -281 158 281
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_GCPBUK.mag b/mag/sky130_fd_pr__pfet_01v8_GCPBUK.mag
new file mode 100644
index 0000000..c8b2f50
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_GCPBUK.mag
@@ -0,0 +1,85 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608350876
+<< error_p >>
+rect -29 -161 29 -155
+rect -29 -195 -17 -161
+rect -29 -201 29 -195
+<< nwell >>
+rect -211 -334 211 334
+<< pmos >>
+rect -15 -114 15 186
+<< pdiff >>
+rect -73 174 -15 186
+rect -73 -102 -61 174
+rect -27 -102 -15 174
+rect -73 -114 -15 -102
+rect 15 174 73 186
+rect 15 -102 27 174
+rect 61 -102 73 174
+rect 15 -114 73 -102
+<< pdiffc >>
+rect -61 -102 -27 174
+rect 27 -102 61 174
+<< nsubdiff >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 -79 -264
+rect 79 -298 175 -264
+<< nsubdiffcont >>
+rect -79 264 79 298
+rect -175 -201 -141 201
+rect 141 -201 175 201
+rect -79 -298 79 -264
+<< poly >>
+rect -15 186 15 212
+rect -15 -145 15 -114
+rect -33 -161 33 -145
+rect -33 -195 -17 -161
+rect 17 -195 33 -161
+rect -33 -211 33 -195
+<< polycont >>
+rect -17 -195 17 -161
+<< locali >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -61 174 -27 190
+rect -61 -118 -27 -102
+rect 27 174 61 190
+rect 27 -118 61 -102
+rect -33 -195 -17 -161
+rect 17 -195 33 -161
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 -79 -264
+rect 79 -298 175 -264
+<< viali >>
+rect -61 -102 -27 174
+rect 27 -102 61 174
+rect -17 -195 17 -161
+<< metal1 >>
+rect -67 174 -21 186
+rect -67 -102 -61 174
+rect -27 -102 -21 174
+rect -67 -114 -21 -102
+rect 21 174 67 186
+rect 21 -102 27 174
+rect 61 -102 67 174
+rect 21 -114 67 -102
+rect -29 -161 29 -155
+rect -29 -195 -17 -161
+rect 17 -195 29 -161
+rect -29 -201 29 -195
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -281 158 281
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_JRPBUD.mag b/mag/sky130_fd_pr__pfet_01v8_JRPBUD.mag
new file mode 100644
index 0000000..ec28a26
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_JRPBUD.mag
@@ -0,0 +1,82 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 195 29 201
+rect -29 161 -17 195
+rect -29 155 29 161
+<< nwell >>
+rect -211 -334 211 334
+<< pmos >>
+rect -15 -186 15 114
+<< pdiff >>
+rect -73 102 -15 114
+rect -73 -174 -61 102
+rect -27 -174 -15 102
+rect -73 -186 -15 -174
+rect 15 102 73 114
+rect 15 -174 27 102
+rect 61 -174 73 102
+rect 15 -186 73 -174
+<< pdiffc >>
+rect -61 -174 -27 102
+rect 27 -174 61 102
+<< nsubdiff >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 175 -264
+<< nsubdiffcont >>
+rect -79 264 79 298
+rect -175 -201 -141 201
+rect 141 -201 175 201
+<< poly >>
+rect -33 195 33 211
+rect -33 161 -17 195
+rect 17 161 33 195
+rect -33 145 33 161
+rect -15 114 15 145
+rect -15 -212 15 -186
+<< polycont >>
+rect -17 161 17 195
+<< locali >>
+rect -175 264 -79 298
+rect 79 264 175 298
+rect -175 201 -141 264
+rect 141 201 175 264
+rect -33 161 -17 195
+rect 17 161 33 195
+rect -61 102 -27 118
+rect -61 -190 -27 -174
+rect 27 102 61 118
+rect 27 -190 61 -174
+rect -175 -264 -141 -201
+rect 141 -264 175 -201
+rect -175 -298 175 -264
+<< viali >>
+rect -17 161 17 195
+rect -61 -174 -27 102
+rect 27 -174 61 102
+<< metal1 >>
+rect -29 195 29 201
+rect -29 161 -17 195
+rect 17 161 29 195
+rect -29 155 29 161
+rect -67 102 -21 114
+rect -67 -174 -61 102
+rect -27 -174 -21 102
+rect -67 -186 -21 -174
+rect 21 102 67 114
+rect 21 -174 27 102
+rect 61 -174 67 102
+rect 21 -186 67 -174
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -281 158 281
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 1 botc 0 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_YY478G.mag b/mag/sky130_fd_pr__pfet_01v8_YY478G.mag
new file mode 100644
index 0000000..f5976fb
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_YY478G.mag
@@ -0,0 +1,97 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect -29 191 29 197
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect -29 -237 29 -231
+<< nwell >>
+rect -211 -369 211 369
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< nsubdiff >>
+rect -175 299 -79 333
+rect 79 299 175 333
+rect -175 237 -141 299
+rect 141 237 175 299
+rect -175 -299 -141 -237
+rect 141 -299 175 -237
+rect -175 -333 175 -299
+<< nsubdiffcont >>
+rect -79 299 79 333
+rect -175 -237 -141 237
+rect 141 -237 175 237
+<< poly >>
+rect -33 231 33 247
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -33 181 33 197
+rect -15 150 15 181
+rect -15 -181 15 -150
+rect -33 -197 33 -181
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -33 -247 33 -231
+<< polycont >>
+rect -17 197 17 231
+rect -17 -231 17 -197
+<< locali >>
+rect -175 299 -79 333
+rect 79 299 175 333
+rect -175 237 -141 299
+rect 141 237 175 299
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -175 -299 -141 -237
+rect 141 -299 175 -237
+rect -175 -333 175 -299
+<< viali >>
+rect -17 197 17 231
+rect -61 -138 -27 138
+rect 27 -138 61 138
+rect -17 -231 17 -197
+<< metal1 >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect 17 197 29 231
+rect -29 191 29 197
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect 17 -231 29 -197
+rect -29 -237 29 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -316 158 316
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 0 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_YY4FRB.mag b/mag/sky130_fd_pr__pfet_01v8_YY4FRB.mag
new file mode 100644
index 0000000..6c39419
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_YY4FRB.mag
@@ -0,0 +1,97 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect -29 191 29 197
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect -29 -237 29 -231
+<< nwell >>
+rect -211 -369 211 369
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< nsubdiff >>
+rect -175 299 -79 333
+rect 79 299 175 333
+rect -175 237 -141 299
+rect 141 237 175 299
+rect -175 -299 -141 -237
+rect 141 -299 175 -237
+rect -175 -333 175 -299
+<< nsubdiffcont >>
+rect -79 299 79 333
+rect -175 -237 -141 237
+rect 141 -237 175 237
+<< poly >>
+rect -33 231 33 247
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -33 181 33 197
+rect -15 150 15 181
+rect -15 -181 15 -150
+rect -33 -197 33 -181
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -33 -247 33 -231
+<< polycont >>
+rect -17 197 17 231
+rect -17 -231 17 -197
+<< locali >>
+rect -175 299 -79 333
+rect 79 299 175 333
+rect -175 237 -141 299
+rect 141 237 175 299
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -175 -299 -141 -237
+rect 141 -299 175 -237
+rect -175 -333 175 -299
+<< viali >>
+rect -17 197 17 231
+rect -61 -138 -27 138
+rect 27 -138 61 138
+rect -17 -231 17 -197
+<< metal1 >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect 17 197 29 231
+rect -29 191 29 197
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect 17 -231 29 -197
+rect -29 -237 29 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -316 158 316
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_YYLBUB.mag b/mag/sky130_fd_pr__pfet_01v8_YYLBUB.mag
new file mode 100644
index 0000000..c649fb1
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_YYLBUB.mag
@@ -0,0 +1,77 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect -29 191 29 197
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect -29 -237 29 -231
+<< nwell >>
+rect -109 -250 109 250
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< poly >>
+rect -33 231 33 247
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -33 181 33 197
+rect -15 150 15 181
+rect -15 -181 15 -150
+rect -33 -197 33 -181
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -33 -247 33 -231
+<< polycont >>
+rect -17 197 17 231
+rect -17 -231 17 -197
+<< locali >>
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+<< viali >>
+rect -17 197 17 231
+rect -61 -138 -27 138
+rect 27 -138 61 138
+rect -17 -231 17 -197
+<< metal1 >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect 17 197 29 231
+rect -29 191 29 197
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect 17 -231 29 -197
+rect -29 -237 29 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 0 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 1 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__pfet_01v8_YYLBYB.mag b/mag/sky130_fd_pr__pfet_01v8_YYLBYB.mag
new file mode 100644
index 0000000..9c8c300
--- /dev/null
+++ b/mag/sky130_fd_pr__pfet_01v8_YYLBYB.mag
@@ -0,0 +1,77 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608343268
+<< error_p >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect -29 191 29 197
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect -29 -237 29 -231
+<< nwell >>
+rect -109 -250 109 250
+<< pmos >>
+rect -15 -150 15 150
+<< pdiff >>
+rect -73 138 -15 150
+rect -73 -138 -61 138
+rect -27 -138 -15 138
+rect -73 -150 -15 -138
+rect 15 138 73 150
+rect 15 -138 27 138
+rect 61 -138 73 138
+rect 15 -150 73 -138
+<< pdiffc >>
+rect -61 -138 -27 138
+rect 27 -138 61 138
+<< poly >>
+rect -33 231 33 247
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -33 181 33 197
+rect -15 150 15 181
+rect -15 -181 15 -150
+rect -33 -197 33 -181
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+rect -33 -247 33 -231
+<< polycont >>
+rect -17 197 17 231
+rect -17 -231 17 -197
+<< locali >>
+rect -33 197 -17 231
+rect 17 197 33 231
+rect -61 138 -27 154
+rect -61 -154 -27 -138
+rect 27 138 61 154
+rect 27 -154 61 -138
+rect -33 -231 -17 -197
+rect 17 -231 33 -197
+<< viali >>
+rect -17 197 17 231
+rect -61 -138 -27 138
+rect 27 -138 61 138
+rect -17 -231 17 -197
+<< metal1 >>
+rect -29 231 29 237
+rect -29 197 -17 231
+rect 17 197 29 231
+rect -29 191 29 197
+rect -67 138 -21 150
+rect -67 -138 -61 138
+rect -27 -138 -21 138
+rect -67 -150 -21 -138
+rect 21 138 67 150
+rect 21 -138 27 138
+rect 61 -138 67 138
+rect 21 -150 67 -138
+rect -29 -197 29 -191
+rect -29 -231 -17 -197
+rect 17 -231 29 -197
+rect -29 -237 29 -231
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string parameters w 1.5 l 0.15 m 1 nf 1 diffcov 100 polycov 100 guard 0 glc 1 grc 1 gtc 1 gbc 0 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 0 viagl 0 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
+string library sky130
+<< end >>