Revised the POR layout, which includes making use of the updated parameterized
PDK cells with vias to metal1 included.  This changed the hash name of the
cells and so left behind a number of unreferenced cells, which have been deleted.
diff --git a/mag/simple_por.mag b/mag/simple_por.mag
index e7fb76c..7fa35e0 100644
--- a/mag/simple_por.mag
+++ b/mag/simple_por.mag
@@ -1,14 +1,23 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605927685
+timestamp 1605995445
 << error_s >>
+rect -4389 9085 -4379 9131
+rect -4361 9057 -4351 9159
+rect -4073 9057 -4066 9159
+rect -4045 9085 -4038 9131
+rect -1626 9085 -1613 9131
+rect -1598 9057 -1585 9159
 rect -592 8620 -576 8678
 rect 26 8666 30 8678
 rect 38 8632 42 8666
+rect -5119 8532 -5112 8578
+rect -5091 8504 -5084 8605
 rect -404 8054 -392 8100
 rect -125 8074 -121 8108
 << pwell >>
+rect -7384 8100 -7328 8110
 rect -5312 7347 -5094 7557
 << locali >>
 rect -7906 8982 -7699 9791
@@ -17,7 +26,7 @@
 rect -7906 8906 -1313 8982
 rect -7906 8836 -787 8906
 rect -4804 8732 -787 8836
-rect -7912 7919 -7737 8709
+rect -7912 7919 -7726 8710
 rect -4804 8536 -1313 8732
 rect -4940 7919 -1313 8369
 rect -7912 7674 2913 7919
@@ -57,6 +66,8 @@
 rect -5299 7360 -5107 7546
 rect 2254 7128 2392 7560
 << metal1 >>
+rect -7034 9616 -5348 9660
+rect -3564 9612 -2090 9656
 rect -1167 9603 2564 9740
 rect -1167 9579 -783 9603
 rect -7662 9555 -7565 9557
@@ -64,10 +75,14 @@
 rect -7220 9423 -5026 9559
 rect -7345 9184 -5310 9319
 rect -4854 9189 -4547 9335
-rect -7662 8091 -7565 9170
+rect -7662 8652 -7565 9170
+rect -7034 9084 -5348 9128
 rect -4361 8875 -4291 9566
 rect -5465 8805 -4291 8875
+rect -7662 8500 -7584 8652
+rect -7662 8104 -7565 8500
 rect -7502 7475 -7448 8564
+rect -7066 8534 -5592 8578
 rect -7384 8276 -7213 8503
 rect -5465 8483 -5395 8805
 rect -4361 8804 -4291 8805
@@ -76,11 +91,14 @@
 rect -4148 8696 -4066 9575
 rect -3738 9403 -1776 9564
 rect -3881 9176 -2045 9336
+rect -3568 9084 -2094 9128
 rect -5091 8605 -4066 8696
 rect -7384 8110 -5287 8276
-rect -7384 7864 -7213 8110
+rect -7384 8100 -7213 8110
 rect -5091 8104 -5005 8605
 rect -1598 8249 -1516 9575
+rect -7342 7864 -7213 8100
+rect -7066 8020 -5592 8064
 rect -1167 7664 -943 9579
 rect -789 8765 2570 9020
 rect -789 8632 2734 8765
@@ -111,64 +129,64 @@
 rect 219 581 275 1381
 << metal3 >>
 rect 3560 3862 4360 3982
-use sky130_fd_pr__nfet_g5v0d10v5_BN2NTK  sky130_fd_pr__nfet_g5v0d10v5_BN2NTK_0
-timestamp 1605923309
-transform 1 0 -5189 0 1 8299
-box -308 -458 308 458
-use sky130_fd_pr__nfet_g5v0d10v5_BN2NTK  sky130_fd_pr__nfet_g5v0d10v5_BN2NTK_1
-timestamp 1605923309
-transform -1 0 -7477 0 1 8299
-box -308 -458 308 458
-use sky130_fd_pr__nfet_g5v0d10v5_BGRBXK  sky130_fd_pr__nfet_g5v0d10v5_BGRBXK_0
-timestamp 1605923309
-transform 1 0 -6333 0 1 8299
+use sky130_fd_pr__pfet_g5v0d10v5_6UDFJU  sky130_fd_pr__pfet_g5v0d10v5_6UDFJU_0
+timestamp 1605994897
+transform 1 0 -6190 0 1 9372
+box -1101 -497 1101 497
+use sky130_fd_pr__pfet_g5v0d10v5_6E4TNU  sky130_fd_pr__pfet_g5v0d10v5_6E4TNU_0
+timestamp 1605994897
+transform 1 0 -7439 0 1 9372
+box -338 -497 338 497
+use sky130_fd_pr__nfet_g5v0d10v5_CWNXJM  sky130_fd_pr__nfet_g5v0d10v5_CWNXJM_0
+timestamp 1605994897
+transform 1 0 -6332 0 1 8300
 box -962 -458 962 458
+use sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC  sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC_1
+timestamp 1605994897
+transform -1 0 -7476 0 1 8300
+box -308 -458 308 458
+use sky130_fd_pr__pfet_g5v0d10v5_ZPXEXA  sky130_fd_pr__pfet_g5v0d10v5_ZPXEXA_0
+timestamp 1605995445
+transform 1 0 -2829 0 1 9372
+box -992 -497 992 497
+use sky130_fd_pr__pfet_g5v0d10v5_Z95PRA  sky130_fd_pr__pfet_g5v0d10v5_Z95PRA_0
+timestamp 1605995445
+transform 1 0 -4941 0 1 9372
+box -338 -497 338 497
+use sky130_fd_pr__pfet_g5v0d10v5_6E4TNU  sky130_fd_pr__pfet_g5v0d10v5_6E4TNU_2
+timestamp 1605994897
+transform 1 0 -4455 0 1 9372
+box -338 -497 338 497
+use sky130_fd_pr__pfet_g5v0d10v5_6E4TNU  sky130_fd_pr__pfet_g5v0d10v5_6E4TNU_3
+timestamp 1605994897
+transform 1 0 -3969 0 1 9372
+box -338 -497 338 497
+use sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC  sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC_0
+timestamp 1605994897
+transform 1 0 -5188 0 1 8300
+box -308 -458 308 458
+use sky130_fd_pr__pfet_g5v0d10v5_6E4TNU  sky130_fd_pr__pfet_g5v0d10v5_6E4TNU_4
+timestamp 1605994897
+transform 1 0 -1689 0 1 9372
+box -338 -497 338 497
 use sky130_fd_sc_hvl__schmittbuf_1  sky130_fd_sc_hvl__schmittbuf_1_0 ~/projects/efabless/tech/SW/sky130A/libs.ref/sky130_fd_sc_hvl/mag
-timestamp 1605926584
+timestamp 1605995445
 transform 1 0 -790 0 1 7935
 box -66 -23 1122 897
 use sky130_fd_sc_hvl__buf_8  sky130_fd_sc_hvl__buf_8_0 ~/projects/efabless/tech/SW/sky130A/libs.ref/sky130_fd_sc_hvl/mag
-timestamp 1605926584
+timestamp 1605995445
 transform 1 0 266 0 1 7935
 box -66 -23 1986 897
-use sky130_fd_sc_hvl__fill_4  sky130_fd_sc_hvl__fill_4_0 ~/projects/efabless/tech/SW/sky130A/libs.ref/sky130_fd_sc_hvl/mag
-timestamp 1605926584
-transform 1 0 2186 0 1 7935
-box -66 -23 450 897
-use sky130_fd_pr__pfet_g5v0d10v5_625PAY  sky130_fd_pr__pfet_g5v0d10v5_625PAY_3
-timestamp 1605926584
-transform 1 0 -4941 0 1 9372
-box -338 -497 338 497
-use sky130_fd_pr__pfet_g5v0d10v5_625PDX  sky130_fd_pr__pfet_g5v0d10v5_625PDX_0
-timestamp 1605926584
-transform 1 0 -6190 0 1 9372
-box -1101 -497 1101 497
-use sky130_fd_pr__pfet_g5v0d10v5_625PAY  sky130_fd_pr__pfet_g5v0d10v5_625PAY_4
-timestamp 1605926584
-transform 1 0 -7439 0 1 9372
-box -338 -497 338 497
-use sky130_fd_pr__pfet_g5v0d10v5_625P8Z  sky130_fd_pr__pfet_g5v0d10v5_625P8Z_0
-timestamp 1605926584
-transform 1 0 -2829 0 1 9372
-box -992 -497 992 497
-use sky130_fd_pr__pfet_g5v0d10v5_625PAY  sky130_fd_pr__pfet_g5v0d10v5_625PAY_0
-timestamp 1605926584
-transform 1 0 -3969 0 1 9372
-box -338 -497 338 497
-use sky130_fd_pr__pfet_g5v0d10v5_625PAY  sky130_fd_pr__pfet_g5v0d10v5_625PAY_2
-timestamp 1605926584
-transform 1 0 -4455 0 1 9372
-box -338 -497 338 497
-use sky130_fd_pr__pfet_g5v0d10v5_625PAY  sky130_fd_pr__pfet_g5v0d10v5_625PAY_1
-timestamp 1605926584
-transform 1 0 -1689 0 1 9372
-box -338 -497 338 497
 use sky130_fd_sc_hvl__buf_8  sky130_fd_sc_hvl__buf_8_1
-timestamp 1605926584
+timestamp 1605995445
 transform 1 0 -790 0 -1 9703
 box -66 -23 1986 897
+use sky130_fd_sc_hvl__fill_4  sky130_fd_sc_hvl__fill_4_0 ~/projects/efabless/tech/SW/sky130A/libs.ref/sky130_fd_sc_hvl/mag
+timestamp 1605995445
+transform 1 0 2186 0 1 7935
+box -66 -23 450 897
 use sky130_fd_sc_hvl__inv_8  sky130_fd_sc_hvl__inv_8_0 ~/projects/efabless/tech/SW/sky130A/libs.ref/sky130_fd_sc_hvl/mag
-timestamp 1605926584
+timestamp 1605995445
 transform 1 0 1130 0 -1 9703
 box -66 -23 1506 897
 use sky130_fd_pr__res_xhigh_po_0p69_LV2JUS  sky130_fd_pr__res_xhigh_po_0p69_LV2JUS_0
diff --git a/mag/sky130_fd_pr__nfet_g5v0d10v5_BGRBXK.mag b/mag/sky130_fd_pr__nfet_g5v0d10v5_BGRBXK.mag
deleted file mode 100644
index 3f28e05..0000000
--- a/mag/sky130_fd_pr__nfet_g5v0d10v5_BGRBXK.mag
+++ /dev/null
@@ -1,208 +0,0 @@
-magic
-tech sky130A
-timestamp 1605923309
-<< pwell >>
-rect -481 -229 481 229
-<< mvnmos >>
-rect -367 -100 -287 100
-rect -258 -100 -178 100
-rect -149 -100 -69 100
-rect -40 -100 40 100
-rect 69 -100 149 100
-rect 178 -100 258 100
-rect 287 -100 367 100
-<< mvndiff >>
-rect -396 94 -367 100
-rect -396 -94 -390 94
-rect -373 -94 -367 94
-rect -396 -100 -367 -94
-rect -287 94 -258 100
-rect -287 -94 -281 94
-rect -264 -94 -258 94
-rect -287 -100 -258 -94
-rect -178 94 -149 100
-rect -178 -94 -172 94
-rect -155 -94 -149 94
-rect -178 -100 -149 -94
-rect -69 94 -40 100
-rect -69 -94 -63 94
-rect -46 -94 -40 94
-rect -69 -100 -40 -94
-rect 40 94 69 100
-rect 40 -94 46 94
-rect 63 -94 69 94
-rect 40 -100 69 -94
-rect 149 94 178 100
-rect 149 -94 155 94
-rect 172 -94 178 94
-rect 149 -100 178 -94
-rect 258 94 287 100
-rect 258 -94 264 94
-rect 281 -94 287 94
-rect 258 -100 287 -94
-rect 367 94 396 100
-rect 367 -94 373 94
-rect 390 -94 396 94
-rect 367 -100 396 -94
-<< mvndiffc >>
-rect -390 -94 -373 94
-rect -281 -94 -264 94
-rect -172 -94 -155 94
-rect -63 -94 -46 94
-rect 46 -94 63 94
-rect 155 -94 172 94
-rect 264 -94 281 94
-rect 373 -94 390 94
-<< mvpsubdiff >>
-rect -463 205 463 211
-rect -463 188 -409 205
-rect 409 188 463 205
-rect -463 182 463 188
-rect -463 157 -434 182
-rect -463 -157 -457 157
-rect -440 -157 -434 157
-rect 434 157 463 182
-rect -463 -182 -434 -157
-rect 434 -157 440 157
-rect 457 -157 463 157
-rect 434 -182 463 -157
-rect -463 -188 463 -182
-rect -463 -205 -409 -188
-rect 409 -205 463 -188
-rect -463 -211 463 -205
-<< mvpsubdiffcont >>
-rect -409 188 409 205
-rect -457 -157 -440 157
-rect 440 -157 457 157
-rect -409 -205 409 -188
-<< poly >>
-rect -367 136 -287 144
-rect -367 119 -359 136
-rect -295 119 -287 136
-rect -367 100 -287 119
-rect -258 136 -178 144
-rect -258 119 -250 136
-rect -186 119 -178 136
-rect -258 100 -178 119
-rect -149 136 -69 144
-rect -149 119 -141 136
-rect -77 119 -69 136
-rect -149 100 -69 119
-rect -40 136 40 144
-rect -40 119 -32 136
-rect 32 119 40 136
-rect -40 100 40 119
-rect 69 136 149 144
-rect 69 119 77 136
-rect 141 119 149 136
-rect 69 100 149 119
-rect 178 136 258 144
-rect 178 119 186 136
-rect 250 119 258 136
-rect 178 100 258 119
-rect 287 136 367 144
-rect 287 119 295 136
-rect 359 119 367 136
-rect 287 100 367 119
-rect -367 -119 -287 -100
-rect -367 -136 -359 -119
-rect -295 -136 -287 -119
-rect -367 -144 -287 -136
-rect -258 -119 -178 -100
-rect -258 -136 -250 -119
-rect -186 -136 -178 -119
-rect -258 -144 -178 -136
-rect -149 -119 -69 -100
-rect -149 -136 -141 -119
-rect -77 -136 -69 -119
-rect -149 -144 -69 -136
-rect -40 -119 40 -100
-rect -40 -136 -32 -119
-rect 32 -136 40 -119
-rect -40 -144 40 -136
-rect 69 -119 149 -100
-rect 69 -136 77 -119
-rect 141 -136 149 -119
-rect 69 -144 149 -136
-rect 178 -119 258 -100
-rect 178 -136 186 -119
-rect 250 -136 258 -119
-rect 178 -144 258 -136
-rect 287 -119 367 -100
-rect 287 -136 295 -119
-rect 359 -136 367 -119
-rect 287 -144 367 -136
-<< polycont >>
-rect -359 119 -295 136
-rect -250 119 -186 136
-rect -141 119 -77 136
-rect -32 119 32 136
-rect 77 119 141 136
-rect 186 119 250 136
-rect 295 119 359 136
-rect -359 -136 -295 -119
-rect -250 -136 -186 -119
-rect -141 -136 -77 -119
-rect -32 -136 32 -119
-rect 77 -136 141 -119
-rect 186 -136 250 -119
-rect 295 -136 359 -119
-<< locali >>
-rect -457 188 -409 205
-rect 409 188 457 205
-rect -457 157 -440 188
-rect 440 157 457 188
-rect -367 119 -359 136
-rect -295 119 -287 136
-rect -258 119 -250 136
-rect -186 119 -178 136
-rect -149 119 -141 136
-rect -77 119 -69 136
-rect -40 119 -32 136
-rect 32 119 40 136
-rect 69 119 77 136
-rect 141 119 149 136
-rect 178 119 186 136
-rect 250 119 258 136
-rect 287 119 295 136
-rect 359 119 367 136
-rect -390 94 -373 102
-rect -390 -102 -373 -94
-rect -281 94 -264 102
-rect -281 -102 -264 -94
-rect -172 94 -155 102
-rect -172 -102 -155 -94
-rect -63 94 -46 102
-rect -63 -102 -46 -94
-rect 46 94 63 102
-rect 46 -102 63 -94
-rect 155 94 172 102
-rect 155 -102 172 -94
-rect 264 94 281 102
-rect 264 -102 281 -94
-rect 373 94 390 102
-rect 373 -102 390 -94
-rect -367 -136 -359 -119
-rect -295 -136 -287 -119
-rect -258 -136 -250 -119
-rect -186 -136 -178 -119
-rect -149 -136 -141 -119
-rect -77 -136 -69 -119
-rect -40 -136 -32 -119
-rect 32 -136 40 -119
-rect 69 -136 77 -119
-rect 141 -136 149 -119
-rect 178 -136 186 -119
-rect 250 -136 258 -119
-rect 287 -136 295 -119
-rect 359 -136 367 -119
-rect -457 -188 -440 -157
-rect 440 -188 457 -157
-rect -457 -205 -409 -188
-rect 409 -205 457 -188
-<< properties >>
-string gencell sky130_fd_pr__nfet_g5v0d10v5
-string FIXED_BBOX -448 -196 448 196
-string parameters w 2.00 l 0.80 m 1 nf 7 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.50 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
-string library sky130
-<< end >>
diff --git a/mag/sky130_fd_pr__nfet_g5v0d10v5_CWNXJM.mag b/mag/sky130_fd_pr__nfet_g5v0d10v5_CWNXJM.mag
new file mode 100644
index 0000000..03a812f
--- /dev/null
+++ b/mag/sky130_fd_pr__nfet_g5v0d10v5_CWNXJM.mag
@@ -0,0 +1,321 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1605994897
+<< pwell >>
+rect -962 -458 962 458
+<< mvnmos >>
+rect -734 -200 -574 200
+rect -516 -200 -356 200
+rect -298 -200 -138 200
+rect -80 -200 80 200
+rect 138 -200 298 200
+rect 356 -200 516 200
+rect 574 -200 734 200
+<< mvndiff >>
+rect -792 188 -734 200
+rect -792 -188 -780 188
+rect -746 -188 -734 188
+rect -792 -200 -734 -188
+rect -574 188 -516 200
+rect -574 -188 -562 188
+rect -528 -188 -516 188
+rect -574 -200 -516 -188
+rect -356 188 -298 200
+rect -356 -188 -344 188
+rect -310 -188 -298 188
+rect -356 -200 -298 -188
+rect -138 188 -80 200
+rect -138 -188 -126 188
+rect -92 -188 -80 188
+rect -138 -200 -80 -188
+rect 80 188 138 200
+rect 80 -188 92 188
+rect 126 -188 138 188
+rect 80 -200 138 -188
+rect 298 188 356 200
+rect 298 -188 310 188
+rect 344 -188 356 188
+rect 298 -200 356 -188
+rect 516 188 574 200
+rect 516 -188 528 188
+rect 562 -188 574 188
+rect 516 -200 574 -188
+rect 734 188 792 200
+rect 734 -188 746 188
+rect 780 -188 792 188
+rect 734 -200 792 -188
+<< mvndiffc >>
+rect -780 -188 -746 188
+rect -562 -188 -528 188
+rect -344 -188 -310 188
+rect -126 -188 -92 188
+rect 92 -188 126 188
+rect 310 -188 344 188
+rect 528 -188 562 188
+rect 746 -188 780 188
+<< mvpsubdiff >>
+rect -926 410 926 422
+rect -926 376 -818 410
+rect 818 376 926 410
+rect -926 364 926 376
+rect -926 314 -868 364
+rect -926 -314 -914 314
+rect -880 -314 -868 314
+rect 868 314 926 364
+rect -926 -364 -868 -314
+rect 868 -314 880 314
+rect 914 -314 926 314
+rect 868 -364 926 -314
+rect -926 -376 926 -364
+rect -926 -410 -818 -376
+rect 818 -410 926 -376
+rect -926 -422 926 -410
+<< mvpsubdiffcont >>
+rect -818 376 818 410
+rect -914 -314 -880 314
+rect 880 -314 914 314
+rect -818 -410 818 -376
+<< poly >>
+rect -734 272 -574 288
+rect -734 238 -718 272
+rect -590 238 -574 272
+rect -734 200 -574 238
+rect -516 272 -356 288
+rect -516 238 -500 272
+rect -372 238 -356 272
+rect -516 200 -356 238
+rect -298 272 -138 288
+rect -298 238 -282 272
+rect -154 238 -138 272
+rect -298 200 -138 238
+rect -80 272 80 288
+rect -80 238 -64 272
+rect 64 238 80 272
+rect -80 200 80 238
+rect 138 272 298 288
+rect 138 238 154 272
+rect 282 238 298 272
+rect 138 200 298 238
+rect 356 272 516 288
+rect 356 238 372 272
+rect 500 238 516 272
+rect 356 200 516 238
+rect 574 272 734 288
+rect 574 238 590 272
+rect 718 238 734 272
+rect 574 200 734 238
+rect -734 -238 -574 -200
+rect -734 -272 -718 -238
+rect -590 -272 -574 -238
+rect -734 -288 -574 -272
+rect -516 -238 -356 -200
+rect -516 -272 -500 -238
+rect -372 -272 -356 -238
+rect -516 -288 -356 -272
+rect -298 -238 -138 -200
+rect -298 -272 -282 -238
+rect -154 -272 -138 -238
+rect -298 -288 -138 -272
+rect -80 -238 80 -200
+rect -80 -272 -64 -238
+rect 64 -272 80 -238
+rect -80 -288 80 -272
+rect 138 -238 298 -200
+rect 138 -272 154 -238
+rect 282 -272 298 -238
+rect 138 -288 298 -272
+rect 356 -238 516 -200
+rect 356 -272 372 -238
+rect 500 -272 516 -238
+rect 356 -288 516 -272
+rect 574 -238 734 -200
+rect 574 -272 590 -238
+rect 718 -272 734 -238
+rect 574 -288 734 -272
+<< polycont >>
+rect -718 238 -590 272
+rect -500 238 -372 272
+rect -282 238 -154 272
+rect -64 238 64 272
+rect 154 238 282 272
+rect 372 238 500 272
+rect 590 238 718 272
+rect -718 -272 -590 -238
+rect -500 -272 -372 -238
+rect -282 -272 -154 -238
+rect -64 -272 64 -238
+rect 154 -272 282 -238
+rect 372 -272 500 -238
+rect 590 -272 718 -238
+<< locali >>
+rect -914 376 -818 410
+rect 818 376 914 410
+rect -914 314 -880 376
+rect 880 314 914 376
+rect -734 238 -718 272
+rect -590 238 -574 272
+rect -516 238 -500 272
+rect -372 238 -356 272
+rect -298 238 -282 272
+rect -154 238 -138 272
+rect -80 238 -64 272
+rect 64 238 80 272
+rect 138 238 154 272
+rect 282 238 298 272
+rect 356 238 372 272
+rect 500 238 516 272
+rect 574 238 590 272
+rect 718 238 734 272
+rect -780 188 -746 204
+rect -780 -204 -746 -188
+rect -562 188 -528 204
+rect -562 -204 -528 -188
+rect -344 188 -310 204
+rect -344 -204 -310 -188
+rect -126 188 -92 204
+rect -126 -204 -92 -188
+rect 92 188 126 204
+rect 92 -204 126 -188
+rect 310 188 344 204
+rect 310 -204 344 -188
+rect 528 188 562 204
+rect 528 -204 562 -188
+rect 746 188 780 204
+rect 746 -204 780 -188
+rect -734 -272 -718 -238
+rect -590 -272 -574 -238
+rect -516 -272 -500 -238
+rect -372 -272 -356 -238
+rect -298 -272 -282 -238
+rect -154 -272 -138 -238
+rect -80 -272 -64 -238
+rect 64 -272 80 -238
+rect 138 -272 154 -238
+rect 282 -272 298 -238
+rect 356 -272 372 -238
+rect 500 -272 516 -238
+rect 574 -272 590 -238
+rect 718 -272 734 -238
+rect -914 -376 -880 -314
+rect 880 -376 914 -314
+rect -914 -410 -818 -376
+rect 818 -410 914 -376
+<< viali >>
+rect -718 238 -590 272
+rect -500 238 -372 272
+rect -282 238 -154 272
+rect -64 238 64 272
+rect 154 238 282 272
+rect 372 238 500 272
+rect 590 238 718 272
+rect -780 21 -746 171
+rect -562 -171 -528 -21
+rect -344 21 -310 171
+rect -126 -171 -92 -21
+rect 92 21 126 171
+rect 310 -171 344 -21
+rect 528 21 562 171
+rect 746 -171 780 -21
+rect -718 -272 -590 -238
+rect -500 -272 -372 -238
+rect -282 -272 -154 -238
+rect -64 -272 64 -238
+rect 154 -272 282 -238
+rect 372 -272 500 -238
+rect 590 -272 718 -238
+<< metal1 >>
+rect -730 272 -578 278
+rect -730 238 -718 272
+rect -590 238 -578 272
+rect -730 232 -578 238
+rect -512 272 -360 278
+rect -512 238 -500 272
+rect -372 238 -360 272
+rect -512 232 -360 238
+rect -294 272 -142 278
+rect -294 238 -282 272
+rect -154 238 -142 272
+rect -294 232 -142 238
+rect -76 272 76 278
+rect -76 238 -64 272
+rect 64 238 76 272
+rect -76 232 76 238
+rect 142 272 294 278
+rect 142 238 154 272
+rect 282 238 294 272
+rect 142 232 294 238
+rect 360 272 512 278
+rect 360 238 372 272
+rect 500 238 512 272
+rect 360 232 512 238
+rect 578 272 730 278
+rect 578 238 590 272
+rect 718 238 730 272
+rect 578 232 730 238
+rect -786 171 -740 183
+rect -786 21 -780 171
+rect -746 21 -740 171
+rect -786 9 -740 21
+rect -350 171 -304 183
+rect -350 21 -344 171
+rect -310 21 -304 171
+rect -350 9 -304 21
+rect 86 171 132 183
+rect 86 21 92 171
+rect 126 21 132 171
+rect 86 9 132 21
+rect 522 171 568 183
+rect 522 21 528 171
+rect 562 21 568 171
+rect 522 9 568 21
+rect -568 -21 -522 -9
+rect -568 -171 -562 -21
+rect -528 -171 -522 -21
+rect -568 -183 -522 -171
+rect -132 -21 -86 -9
+rect -132 -171 -126 -21
+rect -92 -171 -86 -21
+rect -132 -183 -86 -171
+rect 304 -21 350 -9
+rect 304 -171 310 -21
+rect 344 -171 350 -21
+rect 304 -183 350 -171
+rect 740 -21 786 -9
+rect 740 -171 746 -21
+rect 780 -171 786 -21
+rect 740 -183 786 -171
+rect -730 -238 -578 -232
+rect -730 -272 -718 -238
+rect -590 -272 -578 -238
+rect -730 -278 -578 -272
+rect -512 -238 -360 -232
+rect -512 -272 -500 -238
+rect -372 -272 -360 -238
+rect -512 -278 -360 -272
+rect -294 -238 -142 -232
+rect -294 -272 -282 -238
+rect -154 -272 -142 -238
+rect -294 -278 -142 -272
+rect -76 -238 76 -232
+rect -76 -272 -64 -238
+rect 64 -272 76 -238
+rect -76 -278 76 -272
+rect 142 -238 294 -232
+rect 142 -272 154 -238
+rect 282 -272 294 -238
+rect 142 -278 294 -272
+rect 360 -238 512 -232
+rect 360 -272 372 -238
+rect 500 -272 512 -238
+rect 360 -278 512 -272
+rect 578 -238 730 -232
+rect 578 -272 590 -238
+rect 718 -272 730 -238
+rect 578 -278 730 -272
+<< properties >>
+string gencell sky130_fd_pr__nfet_g5v0d10v5
+string FIXED_BBOX -897 -393 897 393
+string parameters w 2.00 l 0.80 m 1 nf 7 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.50 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 +40 viadrn -40 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/mag/sky130_fd_pr__nfet_g5v0d10v5_BN2NTK.mag b/mag/sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC.mag
similarity index 75%
rename from mag/sky130_fd_pr__nfet_g5v0d10v5_BN2NTK.mag
rename to mag/sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC.mag
index 2537bce..eb312e6 100644
--- a/mag/sky130_fd_pr__nfet_g5v0d10v5_BN2NTK.mag
+++ b/mag/sky130_fd_pr__nfet_g5v0d10v5_ZK8HQC.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1605923309
+timestamp 1605994897
 << pwell >>
 rect -154 -229 154 229
 << mvnmos >>
@@ -63,9 +63,31 @@
 rect 113 -188 130 -157
 rect -130 -205 -82 -188
 rect 82 -205 130 -188
+<< viali >>
+rect -32 119 32 136
+rect -63 -94 -46 94
+rect 46 -94 63 94
+rect -32 -136 32 -119
+<< metal1 >>
+rect -38 136 38 139
+rect -38 119 -32 136
+rect 32 119 38 136
+rect -38 116 38 119
+rect -66 94 -43 100
+rect -66 -94 -63 94
+rect -46 -94 -43 94
+rect -66 -100 -43 -94
+rect 43 94 66 100
+rect 43 -94 46 94
+rect 63 -94 66 94
+rect 43 -100 66 -94
+rect -38 -119 38 -116
+rect -38 -136 -32 -119
+rect 32 -136 38 -119
+rect -38 -139 38 -136
 << properties >>
 string gencell sky130_fd_pr__nfet_g5v0d10v5
 string FIXED_BBOX -121 -196 121 196
-string parameters w 2.00 l 0.80 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 0 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.50 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
+string parameters w 2.00 l 0.80 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 0 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.50 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_g5v0d10v5_625PAY.mag b/mag/sky130_fd_pr__pfet_g5v0d10v5_6E4TNU.mag
similarity index 75%
rename from mag/sky130_fd_pr__pfet_g5v0d10v5_625PAY.mag
rename to mag/sky130_fd_pr__pfet_g5v0d10v5_6E4TNU.mag
index a96f4d8..ee60252 100644
--- a/mag/sky130_fd_pr__pfet_g5v0d10v5_625PAY.mag
+++ b/mag/sky130_fd_pr__pfet_g5v0d10v5_6E4TNU.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605926584
+timestamp 1605994897
 << nwell >>
 rect -338 -497 338 497
 << mvpmos >>
@@ -69,9 +69,31 @@
 rect 226 -385 260 -323
 rect -260 -419 -164 -385
 rect 164 -419 260 -385
+<< viali >>
+rect -64 247 64 281
+rect -126 -188 -92 188
+rect 92 -188 126 188
+rect -64 -281 64 -247
+<< metal1 >>
+rect -76 281 76 287
+rect -76 247 -64 281
+rect 64 247 76 281
+rect -76 241 76 247
+rect -132 188 -86 200
+rect -132 -188 -126 188
+rect -92 -188 -86 188
+rect -132 -200 -86 -188
+rect 86 188 132 200
+rect 86 -188 92 188
+rect 126 -188 132 188
+rect 86 -200 132 -188
+rect -76 -247 76 -241
+rect -76 -281 -64 -247
+rect 64 -281 76 -247
+rect -76 -287 76 -281
 << properties >>
 string gencell sky130_fd_pr__pfet_g5v0d10v5
 string FIXED_BBOX -243 -402 243 402
-string parameters w 2.00 l 0.80 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.50 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
+string parameters w 2.00 l 0.80 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.50 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_g5v0d10v5_625PDX.mag b/mag/sky130_fd_pr__pfet_g5v0d10v5_6UDFJU.mag
similarity index 64%
rename from mag/sky130_fd_pr__pfet_g5v0d10v5_625PDX.mag
rename to mag/sky130_fd_pr__pfet_g5v0d10v5_6UDFJU.mag
index 252456c..f9c833b 100644
--- a/mag/sky130_fd_pr__pfet_g5v0d10v5_625PDX.mag
+++ b/mag/sky130_fd_pr__pfet_g5v0d10v5_6UDFJU.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605926584
+timestamp 1605994897
 << nwell >>
 rect -1101 -497 1101 497
 << mvpmos >>
@@ -223,9 +223,136 @@
 rect 989 -385 1023 -323
 rect -1023 -419 -927 -385
 rect 927 -419 1023 -385
+<< viali >>
+rect -827 247 -699 281
+rect -609 247 -481 281
+rect -391 247 -263 281
+rect -173 247 -45 281
+rect 45 247 173 281
+rect 263 247 391 281
+rect 481 247 609 281
+rect 699 247 827 281
+rect -889 21 -855 171
+rect -671 -171 -637 -21
+rect -453 21 -419 171
+rect -235 -171 -201 -21
+rect -17 21 17 171
+rect 201 -171 235 -21
+rect 419 21 453 171
+rect 637 -171 671 -21
+rect 855 21 889 171
+rect -827 -281 -699 -247
+rect -609 -281 -481 -247
+rect -391 -281 -263 -247
+rect -173 -281 -45 -247
+rect 45 -281 173 -247
+rect 263 -281 391 -247
+rect 481 -281 609 -247
+rect 699 -281 827 -247
+<< metal1 >>
+rect -839 281 -687 287
+rect -839 247 -827 281
+rect -699 247 -687 281
+rect -839 241 -687 247
+rect -621 281 -469 287
+rect -621 247 -609 281
+rect -481 247 -469 281
+rect -621 241 -469 247
+rect -403 281 -251 287
+rect -403 247 -391 281
+rect -263 247 -251 281
+rect -403 241 -251 247
+rect -185 281 -33 287
+rect -185 247 -173 281
+rect -45 247 -33 281
+rect -185 241 -33 247
+rect 33 281 185 287
+rect 33 247 45 281
+rect 173 247 185 281
+rect 33 241 185 247
+rect 251 281 403 287
+rect 251 247 263 281
+rect 391 247 403 281
+rect 251 241 403 247
+rect 469 281 621 287
+rect 469 247 481 281
+rect 609 247 621 281
+rect 469 241 621 247
+rect 687 281 839 287
+rect 687 247 699 281
+rect 827 247 839 281
+rect 687 241 839 247
+rect -895 171 -849 183
+rect -895 21 -889 171
+rect -855 21 -849 171
+rect -895 9 -849 21
+rect -459 171 -413 183
+rect -459 21 -453 171
+rect -419 21 -413 171
+rect -459 9 -413 21
+rect -23 171 23 183
+rect -23 21 -17 171
+rect 17 21 23 171
+rect -23 9 23 21
+rect 413 171 459 183
+rect 413 21 419 171
+rect 453 21 459 171
+rect 413 9 459 21
+rect 849 171 895 183
+rect 849 21 855 171
+rect 889 21 895 171
+rect 849 9 895 21
+rect -677 -21 -631 -9
+rect -677 -171 -671 -21
+rect -637 -171 -631 -21
+rect -677 -183 -631 -171
+rect -241 -21 -195 -9
+rect -241 -171 -235 -21
+rect -201 -171 -195 -21
+rect -241 -183 -195 -171
+rect 195 -21 241 -9
+rect 195 -171 201 -21
+rect 235 -171 241 -21
+rect 195 -183 241 -171
+rect 631 -21 677 -9
+rect 631 -171 637 -21
+rect 671 -171 677 -21
+rect 631 -183 677 -171
+rect -839 -247 -687 -241
+rect -839 -281 -827 -247
+rect -699 -281 -687 -247
+rect -839 -287 -687 -281
+rect -621 -247 -469 -241
+rect -621 -281 -609 -247
+rect -481 -281 -469 -247
+rect -621 -287 -469 -281
+rect -403 -247 -251 -241
+rect -403 -281 -391 -247
+rect -263 -281 -251 -247
+rect -403 -287 -251 -281
+rect -185 -247 -33 -241
+rect -185 -281 -173 -247
+rect -45 -281 -33 -247
+rect -185 -287 -33 -281
+rect 33 -247 185 -241
+rect 33 -281 45 -247
+rect 173 -281 185 -247
+rect 33 -287 185 -281
+rect 251 -247 403 -241
+rect 251 -281 263 -247
+rect 391 -281 403 -247
+rect 251 -287 403 -281
+rect 469 -247 621 -241
+rect 469 -281 481 -247
+rect 609 -281 621 -247
+rect 469 -287 621 -281
+rect 687 -247 839 -241
+rect 687 -281 699 -247
+rect 827 -281 839 -247
+rect 687 -287 839 -281
 << properties >>
 string gencell sky130_fd_pr__pfet_g5v0d10v5
 string FIXED_BBOX -1006 -402 1006 402
-string parameters w 2.00 l 0.80 m 1 nf 8 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.50 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
+string parameters w 2.00 l 0.80 m 1 nf 8 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.50 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 -40 viasrc +40
 string library sky130
 << end >>
diff --git a/mag/sky130_fd_pr__pfet_g5v0d10v5_625PAY.mag b/mag/sky130_fd_pr__pfet_g5v0d10v5_Z95PRA.mag
similarity index 71%
copy from mag/sky130_fd_pr__pfet_g5v0d10v5_625PAY.mag
copy to mag/sky130_fd_pr__pfet_g5v0d10v5_Z95PRA.mag
index a96f4d8..855c656 100644
--- a/mag/sky130_fd_pr__pfet_g5v0d10v5_625PAY.mag
+++ b/mag/sky130_fd_pr__pfet_g5v0d10v5_Z95PRA.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605926584
+timestamp 1605995445
 << nwell >>
 rect -338 -497 338 497
 << mvpmos >>
@@ -69,9 +69,36 @@
 rect 226 -385 260 -323
 rect -260 -419 -164 -385
 rect 164 -419 260 -385
+<< viali >>
+rect -260 -52 -226 256
+rect -64 247 64 281
+rect -126 -188 -92 188
+rect 92 -188 126 188
+rect -64 -281 64 -247
+<< metal1 >>
+rect -76 281 76 287
+rect -266 256 -220 268
+rect -266 -52 -260 256
+rect -226 -52 -220 256
+rect -76 247 -64 281
+rect 64 247 76 281
+rect -76 241 76 247
+rect -266 -64 -220 -52
+rect -132 188 -86 200
+rect -132 -188 -126 188
+rect -92 -188 -86 188
+rect -132 -200 -86 -188
+rect 86 188 132 200
+rect 86 -188 92 188
+rect 126 -188 132 188
+rect 86 -200 132 -188
+rect -76 -247 76 -241
+rect -76 -281 -64 -247
+rect 64 -281 76 -247
+rect -76 -287 76 -281
 << properties >>
 string gencell sky130_fd_pr__pfet_g5v0d10v5
 string FIXED_BBOX -243 -402 243 402
-string parameters w 2.00 l 0.80 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.50 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
+string parameters w 2.00 l 0.80 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.50 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 +40 viagr 0 viagt 0 viagb 0 viagate 100 viadrn 100 viasrc 100
 string library sky130
 << end >>
diff --git a/mag/sky130_fd_pr__pfet_g5v0d10v5_625P8Z.mag b/mag/sky130_fd_pr__pfet_g5v0d10v5_ZPXEXA.mag
similarity index 63%
rename from mag/sky130_fd_pr__pfet_g5v0d10v5_625P8Z.mag
rename to mag/sky130_fd_pr__pfet_g5v0d10v5_ZPXEXA.mag
index 1c670e6..098debe 100644
--- a/mag/sky130_fd_pr__pfet_g5v0d10v5_625P8Z.mag
+++ b/mag/sky130_fd_pr__pfet_g5v0d10v5_ZPXEXA.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605926584
+timestamp 1605995445
 << nwell >>
 rect -992 -497 992 497
 << mvpmos >>
@@ -201,9 +201,126 @@
 rect 880 -385 914 -323
 rect -914 -419 -818 -385
 rect 818 -419 914 -385
+<< viali >>
+rect -718 247 -590 281
+rect -500 247 -372 281
+rect -282 247 -154 281
+rect -64 247 64 281
+rect 154 247 282 281
+rect 372 247 500 281
+rect 590 247 718 281
+rect -914 -52 -880 179
+rect -780 21 -746 171
+rect -562 -171 -528 -21
+rect -344 21 -310 171
+rect -126 -171 -92 -21
+rect 92 21 126 171
+rect 310 -171 344 -21
+rect 528 21 562 171
+rect 746 -171 780 -21
+rect -718 -281 -590 -247
+rect -500 -281 -372 -247
+rect -282 -281 -154 -247
+rect -64 -281 64 -247
+rect 154 -281 282 -247
+rect 372 -281 500 -247
+rect 590 -281 718 -247
+<< metal1 >>
+rect -730 281 -578 287
+rect -730 247 -718 281
+rect -590 247 -578 281
+rect -730 241 -578 247
+rect -512 281 -360 287
+rect -512 247 -500 281
+rect -372 247 -360 281
+rect -512 241 -360 247
+rect -294 281 -142 287
+rect -294 247 -282 281
+rect -154 247 -142 281
+rect -294 241 -142 247
+rect -76 281 76 287
+rect -76 247 -64 281
+rect 64 247 76 281
+rect -76 241 76 247
+rect 142 281 294 287
+rect 142 247 154 281
+rect 282 247 294 281
+rect 142 241 294 247
+rect 360 281 512 287
+rect 360 247 372 281
+rect 500 247 512 281
+rect 360 241 512 247
+rect 578 281 730 287
+rect 578 247 590 281
+rect 718 247 730 281
+rect 578 241 730 247
+rect -920 179 -874 191
+rect -920 -52 -914 179
+rect -880 -52 -874 179
+rect -786 171 -740 183
+rect -786 21 -780 171
+rect -746 21 -740 171
+rect -786 9 -740 21
+rect -350 171 -304 183
+rect -350 21 -344 171
+rect -310 21 -304 171
+rect -350 9 -304 21
+rect 86 171 132 183
+rect 86 21 92 171
+rect 126 21 132 171
+rect 86 9 132 21
+rect 522 171 568 183
+rect 522 21 528 171
+rect 562 21 568 171
+rect 522 9 568 21
+rect -920 -64 -874 -52
+rect -568 -21 -522 -9
+rect -568 -171 -562 -21
+rect -528 -171 -522 -21
+rect -568 -183 -522 -171
+rect -132 -21 -86 -9
+rect -132 -171 -126 -21
+rect -92 -171 -86 -21
+rect -132 -183 -86 -171
+rect 304 -21 350 -9
+rect 304 -171 310 -21
+rect 344 -171 350 -21
+rect 304 -183 350 -171
+rect 740 -21 786 -9
+rect 740 -171 746 -21
+rect 780 -171 786 -21
+rect 740 -183 786 -171
+rect -730 -247 -578 -241
+rect -730 -281 -718 -247
+rect -590 -281 -578 -247
+rect -730 -287 -578 -281
+rect -512 -247 -360 -241
+rect -512 -281 -500 -247
+rect -372 -281 -360 -247
+rect -512 -287 -360 -281
+rect -294 -247 -142 -241
+rect -294 -281 -282 -247
+rect -154 -281 -142 -247
+rect -294 -287 -142 -281
+rect -76 -247 76 -241
+rect -76 -281 -64 -247
+rect 64 -281 76 -247
+rect -76 -287 76 -281
+rect 142 -247 294 -241
+rect 142 -281 154 -247
+rect 282 -281 294 -247
+rect 142 -287 294 -281
+rect 360 -247 512 -241
+rect 360 -281 372 -247
+rect 500 -281 512 -247
+rect 360 -287 512 -281
+rect 578 -247 730 -241
+rect 578 -281 590 -247
+rect 718 -281 730 -247
+rect 578 -287 730 -281
 << properties >>
 string gencell sky130_fd_pr__pfet_g5v0d10v5
 string FIXED_BBOX -897 -402 897 402
-string parameters w 2.00 l 0.80 m 1 nf 7 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.50 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
+string parameters w 2.00 l 0.80 m 1 nf 7 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.50 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 +30 viagr 0 viagt 0 viagb 0 viagate 100 viadrn -40 viasrc +40
 string library sky130
 << end >>