diff --git a/mag/VCO/VCO.mag b/mag/VCO/VCO.mag
index ac487dd..74495c4 100644
--- a/mag/VCO/VCO.mag
+++ b/mag/VCO/VCO.mag
@@ -1,7 +1,29 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1608322492
+timestamp 1608329555
+<< error_s >>
+rect -5124 5190 -4300 5403
+rect -3685 3922 -3578 4160
+rect -3116 3922 -3009 4160
+rect -2547 3922 -2440 4160
+rect -1978 3922 -1871 4160
+rect -1409 3922 -1302 4160
+rect -840 3922 -733 4160
+rect -271 3922 -164 4160
+rect 298 3922 405 4160
+rect 867 3922 974 4160
+rect 1436 3922 1543 4160
+rect 2005 3922 2112 4160
+rect 2574 3922 2681 4160
+rect 3143 3922 3250 4160
+rect 3712 3922 3819 4160
+rect 4281 3922 4388 4160
+rect 4850 3922 4957 4160
+rect 5419 3922 5526 4160
+rect 5988 3922 6095 4160
+rect 6557 3922 6664 4160
+rect 7126 3922 7233 4160
 << nwell >>
 rect 8339 5532 9230 5539
 rect -5124 5192 9230 5532
@@ -513,6 +535,9 @@
 rect 7868 4244 7902 4278
 rect 7940 4244 7962 4278
 rect 7962 4244 7974 4278
+rect -3792 4050 -3742 4108
+rect -4398 3878 -4348 3936
+rect 8538 3876 8588 3934
 rect 8164 3054 8198 3088
 rect 8236 3054 8270 3088
 rect 8308 3054 8342 3088
@@ -1031,13 +1056,20 @@
 rect 7902 4244 7940 4278
 rect 7974 4244 8202 4278
 rect -4314 4172 8202 4244
+rect -3798 4108 -3736 4120
+rect -3798 4050 -3792 4108
+rect -3742 4050 -3736 4108
+rect -3798 4038 -3736 4050
+rect -4404 3936 -4342 3948
+rect -4404 3878 -4398 3936
+rect -4348 3878 -4342 3936
+rect -4404 3866 -4342 3878
 rect 8258 3922 8292 4592
 rect 8741 4451 9231 4706
 rect 8960 4160 8994 4451
-rect 8258 3920 8689 3922
-rect 9050 3920 9082 4350
-rect 8258 3886 8693 3920
-rect 9050 3886 9347 3920
+rect 8532 3934 8594 3946
+rect 8532 3922 8538 3934
+rect 8258 3886 8538 3922
 rect 8168 3624 8202 3684
 rect -4767 2937 -4470 3109
 rect -3770 2956 -3696 3138
@@ -1050,6 +1082,14 @@
 rect 7804 3520 8202 3624
 rect 8168 3444 8202 3520
 rect 8258 3474 8292 3886
+rect 8532 3876 8538 3886
+rect 8588 3922 8594 3934
+rect 8588 3920 8689 3922
+rect 9050 3920 9082 4350
+rect 8588 3886 8693 3920
+rect 9050 3886 9347 3920
+rect 8588 3876 8594 3886
+rect 8532 3864 8594 3876
 rect 8343 3351 8400 3419
 rect 8960 3417 8996 3620
 rect 9050 3526 9082 3886
@@ -1384,7 +1424,7 @@
 box 4 0 76 74
 use inverter  inverter_1
 array 0 20 569 0 0 858
-timestamp 1608322001
+timestamp 1608329555
 transform 1 0 990 0 1 3228
 box -5393 252 -4418 1124
 use sky130_fd_pr__pfet_01v8_373K6R  sky130_fd_pr__pfet_01v8_373K6R_0
@@ -1395,14 +1435,14 @@
 timestamp 1608254796
 transform 1 0 8231 0 1 4426
 box -211 -436 211 459
+use sky130_fd_pr__pfet_01v8_35M7SK  sky130_fd_pr__pfet_01v8_35M7SK_0
+timestamp 1608326616
+transform -1 0 -4765 0 1 4961
+box -211 -128 211 188
 use sky130_fd_pr__pfet_01v8_3D5K6R  sky130_fd_pr__pfet_01v8_3D5K6R_0
 timestamp 1608253231
 transform 1 0 -3667 0 1 4954
 box -211 -324 211 324
-use sky130_fd_pr__pfet_01v8_35M7SK  sky130_fd_pr__pfet_01v8_35M7SK_0
-timestamp 1608253040
-transform -1 0 -4765 0 1 4961
-box -211 -309 211 309
 use via_li_m1  via_li_m1_3
 array 0 19 72 0 0 74
 timestamp 1607692587
diff --git a/mag/VCO/inverter.mag b/mag/VCO/inverter.mag
index a2b21ac..4a9bdc2 100644
--- a/mag/VCO/inverter.mag
+++ b/mag/VCO/inverter.mag
@@ -1,35 +1,25 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1608322001
+timestamp 1608329555
 << nwell >>
 rect -5304 932 -4420 1124
 << pwell >>
+rect -5246 544 -4824 604
 rect -5314 266 -4462 418
-<< psubdiff >>
-rect -5184 366 -4896 368
-rect -5184 292 -5136 366
-rect -4952 292 -4896 366
 << nsubdiff >>
-rect -5156 982 -5116 1056
-rect -4932 982 -4868 1056
-<< psubdiffcont >>
-rect -5136 292 -4952 366
+rect -5216 972 -5190 1026
+rect -4886 972 -4862 1026
 << nsubdiffcont >>
-rect -5116 982 -4932 1056
+rect -5190 972 -4886 1026
 << poly >>
 rect -5048 692 -5018 931
-rect -4801 708 -4747 718
 rect -5393 658 -5018 692
 rect -5048 415 -5018 658
-rect -4836 640 -4747 708
-rect -4801 631 -4747 640
+rect -4800 631 -4747 718
 << locali >>
-rect -5156 982 -5116 1056
-rect -4932 982 -4868 1056
-rect -5184 366 -4896 368
-rect -5184 292 -5136 366
-rect -4952 292 -4896 366
+rect -5216 972 -5190 1026
+rect -4886 972 -4862 1026
 << metal1 >>
 rect -5304 944 -4418 1056
 rect -5096 826 -5062 944
@@ -38,22 +28,12 @@
 rect -5094 396 -5060 531
 rect -5006 437 -4971 658
 rect -5314 292 -4462 396
-use sky130_fd_pr__nfet_01v8_6MNZ3F  inv_nfet
-timestamp 1608322001
-transform 1 0 -5033 0 1 504
-box -211 -252 211 252
-use via_li_m1  via_li_m1_1
-array 0 3 72 0 0 74
-timestamp 1607692587
-transform 1 0 -5192 0 1 294
-box 4 0 76 74
-use via_li_m1  via_li_m1_0
-array 0 3 72 0 0 74
-timestamp 1607692587
-transform 1 0 -5140 0 1 980
-box 4 0 76 74
-use sky130_fd_pr__pfet_01v8_HA7HUY  inv_pfet
-timestamp 1608252628
-transform 1 0 -5033 0 1 863
-box -128 -92 118 92
+use sky130_fd_pr__nfet_01v8_PUCP6T  inv_nfet
+timestamp 1608326735
+transform 1 0 -5033 0 1 507
+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
 << end >>
diff --git a/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.mag b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.mag
index 57b006d..147a45e 100644
--- a/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.mag
+++ b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.mag
@@ -1,13 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1608253040
-<< error_p >>
-rect -29 171 29 177
-rect -29 137 -17 171
-rect -29 131 29 137
+timestamp 1608326616
 << nwell >>
-rect -211 -309 211 309
+rect -211 -128 211 188
 << pmos >>
 rect -15 -90 15 90
 << pdiff >>
@@ -22,53 +18,18 @@
 << pdiffc >>
 rect -61 -78 -27 78
 rect 27 -78 61 78
-<< nsubdiff >>
-rect -175 239 -79 273
-rect 79 239 175 273
-rect -175 177 -141 239
-rect 141 177 175 239
-rect -175 -239 -141 -177
-rect 141 -239 175 -177
-rect -175 -273 -79 -239
-rect 79 -273 175 -239
-<< nsubdiffcont >>
-rect -79 239 79 273
-rect -175 -177 -141 177
-rect 141 -177 175 177
-rect -79 -273 79 -239
 << poly >>
-rect -33 171 33 187
-rect -33 137 -17 171
-rect 17 137 33 171
-rect -33 121 33 137
-rect -15 90 15 121
+rect -15 90 15 116
 rect -15 -126 15 -90
-<< polycont >>
-rect -17 137 17 171
 << locali >>
-rect -175 239 -79 273
-rect 79 239 175 273
-rect -175 177 -141 239
-rect 141 177 175 239
-rect -33 137 -17 171
-rect 17 137 33 171
 rect -61 78 -27 94
 rect -61 -94 -27 -78
 rect 27 78 61 94
 rect 27 -94 61 -78
-rect -175 -239 -141 -177
-rect 141 -239 175 -177
-rect -175 -273 -79 -239
-rect 79 -273 175 -239
 << viali >>
-rect -17 137 17 171
 rect -61 -78 -27 78
 rect 27 -78 61 78
 << metal1 >>
-rect -29 171 29 177
-rect -29 137 -17 171
-rect 17 137 29 171
-rect -29 131 29 137
 rect -67 78 -21 90
 rect -67 -78 -61 78
 rect -27 -78 -21 78
diff --git a/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SP.mag b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SP.mag
new file mode 100644
index 0000000..57b006d
--- /dev/null
+++ b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SP.mag
@@ -0,0 +1,85 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608253040
+<< error_p >>
+rect -29 171 29 177
+rect -29 137 -17 171
+rect -29 131 29 137
+<< nwell >>
+rect -211 -309 211 309
+<< pmos >>
+rect -15 -90 15 90
+<< pdiff >>
+rect -73 78 -15 90
+rect -73 -78 -61 78
+rect -27 -78 -15 78
+rect -73 -90 -15 -78
+rect 15 78 73 90
+rect 15 -78 27 78
+rect 61 -78 73 78
+rect 15 -90 73 -78
+<< pdiffc >>
+rect -61 -78 -27 78
+rect 27 -78 61 78
+<< nsubdiff >>
+rect -175 239 -79 273
+rect 79 239 175 273
+rect -175 177 -141 239
+rect 141 177 175 239
+rect -175 -239 -141 -177
+rect 141 -239 175 -177
+rect -175 -273 -79 -239
+rect 79 -273 175 -239
+<< nsubdiffcont >>
+rect -79 239 79 273
+rect -175 -177 -141 177
+rect 141 -177 175 177
+rect -79 -273 79 -239
+<< poly >>
+rect -33 171 33 187
+rect -33 137 -17 171
+rect 17 137 33 171
+rect -33 121 33 137
+rect -15 90 15 121
+rect -15 -126 15 -90
+<< polycont >>
+rect -17 137 17 171
+<< locali >>
+rect -175 239 -79 273
+rect 79 239 175 273
+rect -175 177 -141 239
+rect 141 177 175 239
+rect -33 137 -17 171
+rect 17 137 33 171
+rect -61 78 -27 94
+rect -61 -94 -27 -78
+rect 27 78 61 94
+rect 27 -94 61 -78
+rect -175 -239 -141 -177
+rect 141 -239 175 -177
+rect -175 -273 -79 -239
+rect 79 -273 175 -239
+<< viali >>
+rect -17 137 17 171
+rect -61 -78 -27 78
+rect 27 -78 61 78
+<< metal1 >>
+rect -29 171 29 177
+rect -29 137 -17 171
+rect 17 137 29 171
+rect -29 131 29 137
+rect -67 78 -21 90
+rect -67 -78 -61 78
+rect -27 -78 -21 78
+rect -67 -90 -21 -78
+rect 21 78 67 90
+rect 21 -78 27 78
+rect 61 -78 67 78
+rect 21 -90 67 -78
+<< properties >>
+string gencell sky130_fd_pr__pfet_01v8
+string FIXED_BBOX -158 -256 158 256
+string parameters w 0.9 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 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 >>