layout_v3
diff --git a/mag/VCO.mag b/mag/VCO.mag
index f3d3579..4d750fe 100644
--- a/mag/VCO.mag
+++ b/mag/VCO.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1607692587
+timestamp 1608321738
 << nwell >>
 rect 748 688 1804 1280
 rect 96 470 1804 688
diff --git a/mag/VCO/VCO.mag b/mag/VCO/VCO.mag
index 74495c4..a39652b 100644
--- a/mag/VCO/VCO.mag
+++ b/mag/VCO/VCO.mag
@@ -1,29 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-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
+timestamp 1608331039
 << nwell >>
 rect 8339 5532 9230 5539
 rect -5124 5192 9230 5532
@@ -34,10 +12,12 @@
 rect -4314 4350 7650 4352
 rect -4256 4160 7650 4350
 rect 7700 4160 8400 4352
+rect -4254 3922 7585 4160
 rect 8054 3926 8400 4160
 rect 8732 3924 9228 5192
 << pwell >>
 rect 8006 3903 8400 3908
+rect -4312 3480 7546 3832
 rect 7999 3670 8400 3903
 rect 7996 3248 8400 3670
 rect 8006 3228 8400 3248
@@ -140,16 +120,139 @@
 rect 7908 4516 7982 4700
 rect 7778 4222 7962 4296
 << poly >>
+rect -4386 3920 -4320 3936
+rect -4386 3886 -4370 3920
+rect -4336 3886 -4320 3920
+rect -4386 3870 -4320 3886
+rect -3834 3916 -3768 3932
+rect -3834 3882 -3818 3916
+rect -3784 3882 -3768 3916
+rect -3834 3866 -3768 3882
+rect -3258 3922 -3192 3938
+rect -3258 3888 -3242 3922
+rect -3208 3888 -3192 3922
+rect -3258 3872 -3192 3888
+rect -2694 3922 -2628 3938
+rect -2694 3888 -2678 3922
+rect -2644 3888 -2628 3922
+rect -2694 3872 -2628 3888
+rect -2124 3920 -2058 3936
+rect -2124 3886 -2108 3920
+rect -2074 3886 -2058 3920
+rect -2124 3870 -2058 3886
+rect -1558 3922 -1492 3938
+rect -1558 3888 -1542 3922
+rect -1508 3888 -1492 3922
+rect -1558 3872 -1492 3888
+rect -996 3922 -930 3938
+rect -996 3888 -980 3922
+rect -946 3888 -930 3922
+rect -996 3872 -930 3888
+rect -412 3924 -346 3940
+rect -412 3890 -396 3924
+rect -362 3890 -346 3924
+rect -412 3874 -346 3890
+rect 154 3920 220 3936
+rect 154 3886 170 3920
+rect 204 3886 220 3920
+rect 154 3870 220 3886
+rect 724 3922 790 3938
+rect 724 3888 740 3922
+rect 774 3888 790 3922
+rect 724 3872 790 3888
+rect 1286 3922 1352 3938
+rect 1286 3888 1302 3922
+rect 1336 3888 1352 3922
+rect 1286 3872 1352 3888
+rect 1848 3920 1914 3936
+rect 1848 3886 1864 3920
+rect 1898 3886 1914 3920
+rect 1848 3870 1914 3886
+rect 2422 3924 2488 3940
+rect 2422 3890 2438 3924
+rect 2472 3890 2488 3924
+rect 2422 3874 2488 3890
+rect 2992 3920 3058 3936
+rect 2992 3886 3008 3920
+rect 3042 3886 3058 3920
+rect 2992 3870 3058 3886
+rect 3560 3920 3626 3936
+rect 3560 3886 3576 3920
+rect 3610 3886 3626 3920
+rect 3560 3870 3626 3886
+rect 4140 3922 4206 3938
+rect 4140 3888 4156 3922
+rect 4190 3888 4206 3922
+rect 4140 3872 4206 3888
+rect 4708 3922 4774 3938
+rect 4708 3888 4724 3922
+rect 4758 3888 4774 3922
+rect 4708 3872 4774 3888
+rect 5276 3920 5342 3936
+rect 5276 3886 5292 3920
+rect 5326 3886 5342 3920
+rect 5276 3870 5342 3886
+rect 5850 3922 5916 3938
+rect 5850 3888 5866 3922
+rect 5900 3888 5916 3922
+rect 5850 3872 5916 3888
+rect 6414 3920 6480 3936
+rect 6414 3886 6430 3920
+rect 6464 3886 6480 3920
+rect 6414 3870 6480 3886
+rect 6984 3920 7050 3936
+rect 7542 3930 7608 3934
+rect 6984 3886 7000 3920
+rect 7034 3886 7050 3920
+rect 6984 3870 7050 3886
+rect 7538 3920 7608 3930
 rect 8216 3920 8246 4699
-rect 8659 3936 8689 3953
-rect 7594 3886 8246 3920
+rect 8659 3938 8689 3953
+rect 7538 3918 8246 3920
+rect 7538 3914 7558 3918
+rect 7538 3880 7554 3914
+rect 7592 3886 8246 3918
+rect 7592 3884 7608 3886
+rect 7588 3880 7608 3884
+rect 7538 3868 7608 3880
+rect 7538 3864 7604 3868
 rect 8216 3371 8246 3886
-rect 8624 3920 8689 3936
+rect 8610 3922 8689 3938
+rect 8610 3888 8626 3922
+rect 8660 3920 8689 3922
 rect 9008 3920 9038 4403
-rect 8624 3886 9038 3920
-rect 8624 3870 8689 3886
+rect 8660 3888 9038 3920
+rect 8610 3886 9038 3888
+rect 8610 3872 8689 3886
+rect 8624 3870 8689 3872
 rect 8659 3857 8689 3870
 rect 9008 3485 9038 3886
+<< polycont >>
+rect -4370 3886 -4336 3920
+rect -3818 3882 -3784 3916
+rect -3242 3888 -3208 3922
+rect -2678 3888 -2644 3922
+rect -2108 3886 -2074 3920
+rect -1542 3888 -1508 3922
+rect -980 3888 -946 3922
+rect -396 3890 -362 3924
+rect 170 3886 204 3920
+rect 740 3888 774 3922
+rect 1302 3888 1336 3922
+rect 1864 3886 1898 3920
+rect 2438 3890 2472 3924
+rect 3008 3886 3042 3920
+rect 3576 3886 3610 3920
+rect 4156 3888 4190 3922
+rect 4724 3888 4758 3922
+rect 5292 3886 5326 3920
+rect 5866 3888 5900 3922
+rect 6430 3886 6464 3920
+rect 7000 3886 7034 3920
+rect 7558 3914 7592 3918
+rect 7554 3884 7592 3914
+rect 7554 3880 7588 3884
+rect 8626 3888 8660 3922
 << locali >>
 rect -4908 5400 -4866 5440
 rect -3574 5400 -3540 5440
@@ -230,6 +333,54 @@
 rect 7974 4244 8002 4278
 rect 7714 4222 7778 4244
 rect 7962 4222 8002 4244
+rect -4386 3886 -4370 3920
+rect -4336 3886 -4320 3920
+rect -3834 3882 -3818 3916
+rect -3784 3882 -3768 3916
+rect -3258 3888 -3242 3922
+rect -3208 3888 -3192 3922
+rect -2694 3888 -2678 3922
+rect -2644 3888 -2628 3922
+rect -2124 3886 -2108 3920
+rect -2074 3886 -2058 3920
+rect -1558 3888 -1542 3922
+rect -1508 3888 -1492 3922
+rect -996 3888 -980 3922
+rect -946 3888 -930 3922
+rect -412 3890 -396 3924
+rect -362 3890 -346 3924
+rect 154 3886 170 3920
+rect 204 3886 220 3920
+rect 724 3888 740 3922
+rect 774 3888 790 3922
+rect 1286 3888 1302 3922
+rect 1336 3888 1352 3922
+rect 1848 3886 1864 3920
+rect 1898 3886 1914 3920
+rect 2422 3890 2438 3924
+rect 2472 3890 2488 3924
+rect 2992 3886 3008 3920
+rect 3042 3886 3058 3920
+rect 3560 3886 3576 3920
+rect 3610 3886 3626 3920
+rect 4140 3888 4156 3922
+rect 4190 3888 4206 3922
+rect 4708 3888 4724 3922
+rect 4758 3888 4774 3922
+rect 5276 3886 5292 3920
+rect 5326 3886 5342 3920
+rect 5850 3888 5866 3922
+rect 5900 3888 5916 3922
+rect 6414 3886 6430 3920
+rect 6464 3886 6480 3920
+rect 6984 3886 7000 3920
+rect 7034 3886 7050 3920
+rect 7542 3914 7558 3918
+rect 7538 3880 7554 3914
+rect 7592 3884 7608 3918
+rect 8610 3888 8626 3922
+rect 8660 3888 8676 3922
+rect 7588 3880 7604 3884
 rect 8150 3154 8210 3190
 rect 9074 3154 9160 3190
 rect 8154 3054 8164 3088
@@ -535,9 +686,31 @@
 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 -4370 3886 -4336 3920
+rect -3818 3882 -3784 3916
+rect -3242 3888 -3208 3922
+rect -2678 3888 -2644 3922
+rect -2108 3886 -2074 3920
+rect -1542 3888 -1508 3922
+rect -980 3888 -946 3922
+rect -396 3890 -362 3924
+rect 170 3886 204 3920
+rect 740 3888 774 3922
+rect 1302 3888 1336 3922
+rect 1864 3886 1898 3920
+rect 2438 3890 2472 3924
+rect 3008 3886 3042 3920
+rect 3576 3886 3610 3920
+rect 4156 3888 4190 3922
+rect 4724 3888 4758 3922
+rect 5292 3886 5326 3920
+rect 5866 3888 5900 3922
+rect 6430 3886 6464 3920
+rect 7000 3886 7034 3920
+rect 7558 3914 7592 3918
+rect 7554 3884 7592 3914
+rect 8626 3888 8660 3922
+rect 7554 3880 7588 3884
 rect 8164 3054 8198 3088
 rect 8236 3054 8270 3088
 rect 8308 3054 8342 3088
@@ -1021,10 +1194,10 @@
 rect -4874 5051 -4832 5198
 rect -4804 5082 -4794 5142
 rect -4734 5082 -4724 5142
-rect -4874 4888 -4790 5051
-rect -3768 5046 -3726 5198
+rect -3768 5054 -3726 5198
 rect -3698 5088 -3688 5148
 rect -3628 5088 -3618 5148
+rect -4874 4888 -4790 5051
 rect -4726 5040 -4470 5046
 rect -4736 5032 -4470 5040
 rect -4874 4886 -4832 4888
@@ -1033,7 +1206,9 @@
 rect -4896 3112 -4822 3114
 rect -4898 2932 -4822 3112
 rect -4736 3109 -4470 4882
-rect -3768 4849 -3698 5046
+rect -3768 5042 -3698 5054
+rect -3768 4752 -3688 5042
+rect -3768 4751 -3698 4752
 rect -3636 4352 -3499 5046
 rect 7850 4712 8202 4866
 rect 7850 4678 7926 4712
@@ -1056,20 +1231,105 @@
 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 -4388 3934 -4318 3938
+rect -4394 3866 -4384 3934
+rect -4314 3866 -4304 3934
+rect -3254 3922 -3196 3928
+rect -3830 3916 -3772 3922
+rect -3830 3882 -3818 3916
+rect -3784 3882 -3772 3916
+rect -3254 3888 -3242 3922
+rect -3208 3888 -3196 3922
+rect -3254 3882 -3196 3888
+rect -2690 3922 -2632 3928
+rect -2690 3888 -2678 3922
+rect -2644 3888 -2632 3922
+rect -2690 3882 -2632 3888
+rect -2120 3920 -2062 3926
+rect -2120 3886 -2108 3920
+rect -2074 3886 -2062 3920
+rect -3830 3876 -3772 3882
+rect -2120 3880 -2062 3886
+rect -1554 3922 -1496 3928
+rect -1554 3888 -1542 3922
+rect -1508 3888 -1496 3922
+rect -1554 3882 -1496 3888
+rect -992 3922 -934 3928
+rect -992 3888 -980 3922
+rect -946 3888 -934 3922
+rect -992 3882 -934 3888
+rect -408 3924 -350 3930
+rect -408 3890 -396 3924
+rect -362 3890 -350 3924
+rect -408 3884 -350 3890
+rect 158 3920 216 3926
+rect 158 3886 170 3920
+rect 204 3886 216 3920
+rect 158 3880 216 3886
+rect 728 3922 786 3928
+rect 728 3888 740 3922
+rect 774 3888 786 3922
+rect 728 3882 786 3888
+rect 1290 3922 1348 3928
+rect 1290 3888 1302 3922
+rect 1336 3888 1348 3922
+rect 1290 3882 1348 3888
+rect 1852 3920 1910 3926
+rect 1852 3886 1864 3920
+rect 1898 3886 1910 3920
+rect 1852 3880 1910 3886
+rect 2426 3924 2484 3930
+rect 2426 3890 2438 3924
+rect 2472 3890 2484 3924
+rect 2426 3884 2484 3890
+rect 2996 3920 3054 3926
+rect 2996 3886 3008 3920
+rect 3042 3886 3054 3920
+rect 2996 3880 3054 3886
+rect 3564 3920 3622 3926
+rect 3564 3886 3576 3920
+rect 3610 3886 3622 3920
+rect 3564 3880 3622 3886
+rect 4144 3922 4202 3928
+rect 4144 3888 4156 3922
+rect 4190 3888 4202 3922
+rect 4144 3882 4202 3888
+rect 4712 3922 4770 3928
+rect 4712 3888 4724 3922
+rect 4758 3888 4770 3922
+rect 4712 3882 4770 3888
+rect 5280 3920 5338 3926
+rect 5280 3886 5292 3920
+rect 5326 3886 5338 3920
+rect 5280 3880 5338 3886
+rect 5854 3922 5912 3928
+rect 5854 3888 5866 3922
+rect 5900 3888 5912 3922
+rect 5854 3882 5912 3888
+rect 6418 3920 6476 3926
+rect 6418 3886 6430 3920
+rect 6464 3886 6476 3920
+rect 6418 3880 6476 3886
+rect 6988 3920 7046 3926
+rect 7546 3920 7604 3924
+rect 6988 3886 7000 3920
+rect 7034 3886 7046 3920
+rect 6988 3880 7046 3886
+rect 7542 3918 7604 3920
+rect 7542 3914 7558 3918
+rect 7542 3880 7554 3914
+rect 7592 3884 7604 3918
+rect 7588 3880 7604 3884
+rect 7542 3878 7604 3880
 rect 8258 3922 8292 4592
 rect 8741 4451 9231 4706
 rect 8960 4160 8994 4451
-rect 8532 3934 8594 3946
-rect 8532 3922 8538 3934
-rect 8258 3886 8538 3922
+rect 8584 3922 8594 3938
+rect 8664 3922 8674 3938
+rect 8258 3886 8594 3922
+rect 8664 3920 8689 3922
+rect 9050 3920 9082 4350
+rect 7542 3874 7600 3878
 rect 8168 3624 8202 3684
 rect -4767 2937 -4470 3109
 rect -3770 2956 -3696 3138
@@ -1082,14 +1342,10 @@
 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 8584 3870 8594 3886
+rect 8664 3886 8693 3920
 rect 9050 3886 9347 3920
-rect 8588 3876 8594 3886
-rect 8532 3864 8594 3876
+rect 8664 3870 8674 3886
 rect 8343 3351 8400 3419
 rect 8960 3417 8996 3620
 rect 9050 3526 9082 3886
@@ -1370,7 +1626,17 @@
 rect -4794 5082 -4734 5142
 rect -3688 5088 -3628 5148
 rect -4730 4882 -4674 5032
+rect -4384 3920 -4314 3934
+rect -4384 3886 -4370 3920
+rect -4370 3886 -4336 3920
+rect -4336 3886 -4314 3920
+rect -4384 3866 -4314 3886
+rect 8594 3922 8664 3938
+rect 8594 3888 8626 3922
+rect 8626 3888 8660 3922
+rect 8660 3888 8664 3922
 rect -4824 2848 -4764 2902
+rect 8594 3870 8664 3888
 rect -3692 2844 -3632 2898
 << metal2 >>
 rect -4794 5148 -4734 5152
@@ -1384,6 +1650,13 @@
 rect -4730 5032 -4658 5042
 rect -4674 4884 -4658 5032
 rect -4730 4872 -4674 4882
+rect -4386 3938 8676 3954
+rect -4386 3934 8594 3938
+rect -4386 3866 -4384 3934
+rect -4314 3870 8594 3934
+rect 8664 3870 8676 3938
+rect -4314 3866 8676 3870
+rect -4386 3842 8676 3866
 rect -4824 2910 -4764 2912
 rect -4836 2902 -3632 2910
 rect -4836 2848 -4824 2902
@@ -1435,14 +1708,10 @@
 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_3DPBUK  sky130_fd_pr__pfet_01v8_3DPBUK_0
+timestamp 1608330103
+transform 1 0 -3653 0 1 4904
+box -211 -242 211 369
 use via_li_m1  via_li_m1_3
 array 0 19 72 0 0 74
 timestamp 1607692587
@@ -1455,11 +1724,11 @@
 box 4 0 76 74
 << labels >>
 rlabel metal1 9050 3886 9347 3920 1 out_vco
-rlabel metal1 8258 3886 8689 3922 1 out_ring
 rlabel metal1 -5114 2462 -3040 2804 1 vss
 rlabel metal1 -5122 5198 -2718 5516 1 vdd
 rlabel metal2 -4764 2848 -3692 2910 1 in
 rlabel space -4324 3520 8202 3624 1 9
 rlabel metal1 -4314 4172 7952 4352 1 10
 rlabel metal2 -4734 5090 -3688 5148 1 5
+rlabel space 8258 3886 8689 3922 1 out_ring
 << end >>
diff --git a/mag/VCO/inverter.mag b/mag/VCO/inverter.mag
index 4a9bdc2..ccf7e27 100644
--- a/mag/VCO/inverter.mag
+++ b/mag/VCO/inverter.mag
@@ -28,12 +28,12 @@
 rect -5094 396 -5060 531
 rect -5006 437 -4971 658
 rect -5314 292 -4462 396
-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
+use sky130_fd_pr__nfet_01v8_PUCP6T  inv_nfet
+timestamp 1608326735
+transform 1 0 -5033 0 1 507
+box -211 -255 211 77
 << end >>
diff --git a/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.mag b/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.mag
new file mode 100644
index 0000000..6285357
--- /dev/null
+++ b/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.mag
@@ -0,0 +1,46 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1608326735
+<< pwell >>
+rect -211 -255 211 64
+<< nmos >>
+rect -15 -45 15 45
+<< ndiff >>
+rect -73 33 -15 45
+rect -73 -33 -61 33
+rect -27 -33 -15 33
+rect -73 -45 -15 -33
+rect 15 33 73 45
+rect 15 -33 27 33
+rect 61 -33 73 33
+rect 15 -45 73 -33
+<< ndiffc >>
+rect -61 -33 -27 33
+rect 27 -33 61 33
+<< poly >>
+rect -15 45 15 77
+rect -15 -71 15 -45
+<< locali >>
+rect -61 33 -27 49
+rect -61 -49 -27 -33
+rect 27 33 61 49
+rect 27 -49 61 -33
+<< viali >>
+rect -61 -33 -27 33
+rect 27 -33 61 33
+<< metal1 >>
+rect -67 33 -21 45
+rect -67 -33 -61 33
+rect -27 -33 -21 33
+rect -67 -45 -21 -33
+rect 21 33 67 45
+rect 21 -33 27 33
+rect 61 -33 67 33
+rect 21 -45 67 -33
+<< properties >>
+string gencell sky130_fd_pr__nfet_01v8
+string FIXED_BBOX -158 -202 158 202
+string parameters w 0.45 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 >>