Corrected the origin of the sky130_ef_top_power_hvc pad (used in the
caravan chip padframe).
diff --git a/VERSION b/VERSION
index 309a6e2..53faade 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.186
+1.0.187
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io.gds
index 1c743e2..914ec9c 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__top_power_hvc.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__top_power_hvc.lef
index 052a698..f28b245 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__top_power_hvc.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__top_power_hvc.lef
@@ -5,18 +5,18 @@
 MACRO sky130_ef_io__top_power_hvc
   CLASS PAD POWER ;
   FOREIGN sky130_ef_io__top_power_hvc ;
-  ORIGIN 0.000 -47.000 ;
+  ORIGIN 0.000 0.000 ;
   SIZE 169.000 BY 197.965 ;
   PIN AMUXBUS_A
     DIRECTION INOUT ;
     USE SIGNAL ;
     PORT
       LAYER met4 ;
-        RECT 0.000 98.090 169.000 101.070 ;
+        RECT 0.000 51.090 169.000 54.070 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 98.090 1.270 101.070 ;
+        RECT 0.000 51.090 1.270 54.070 ;
     END
   END AMUXBUS_A
   PIN AMUXBUS_B
@@ -24,11 +24,11 @@
     USE SIGNAL ;
     PORT
       LAYER met4 ;
-        RECT 0.000 93.330 169.000 96.310 ;
+        RECT 0.000 46.330 169.000 49.310 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 93.330 1.270 96.310 ;
+        RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
   PIN DRN_HVC
@@ -36,11 +36,11 @@
     USE POWER ;
     PORT
       LAYER met2 ;
-        RECT 97.390 44.965 121.290 70.625 ;
+        RECT 97.390 -2.035 121.290 23.625 ;
     END
     PORT
       LAYER met3 ;
-        RECT 84.890 44.965 95.890 56.295 ;
+        RECT 84.890 -2.035 95.890 9.295 ;
     END
   END DRN_HVC
   PIN P_CORE
@@ -48,11 +48,11 @@
     USE POWER ;
     PORT
       LAYER met3 ;
-        RECT 0.000 44.965 71.395 60.650 ;
+        RECT 0.000 -2.035 71.395 13.650 ;
     END
     PORT
       LAYER met3 ;
-        RECT 97.390 44.965 169.000 60.650 ;
+        RECT 97.390 -2.035 169.000 13.650 ;
     END
   END P_CORE
   PIN P_PAD
@@ -60,7 +60,7 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 54.050 150.085 114.890 210.910 ;
+        RECT 54.050 103.085 114.890 163.910 ;
     END
   END P_PAD
   PIN SRC_BDY_HVC
@@ -68,11 +68,11 @@
     USE GROUND ;
     PORT
       LAYER met2 ;
-        RECT 47.495 44.965 71.395 47.020 ;
+        RECT 47.495 -2.035 71.395 0.020 ;
     END
     PORT
       LAYER met3 ;
-        RECT 72.895 44.965 83.895 47.690 ;
+        RECT 72.895 -2.035 83.895 0.690 ;
     END
   END SRC_BDY_HVC
   PIN VSSA
@@ -80,51 +80,51 @@
     USE GROUND ;
     PORT
       LAYER met5 ;
-        RECT 125.885 92.700 169.000 101.700 ;
+        RECT 125.885 45.700 169.000 54.700 ;
     END
     PORT
       LAYER met5 ;
-        RECT 125.885 81.800 169.000 85.050 ;
+        RECT 125.885 34.800 169.000 38.050 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 96.610 169.000 97.790 ;
+        RECT 125.885 49.610 169.000 50.790 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 101.370 169.000 101.700 ;
+        RECT 0.000 54.370 169.000 54.700 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 92.700 169.000 93.030 ;
+        RECT 0.000 45.700 169.000 46.030 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 81.700 169.000 85.150 ;
+        RECT 125.885 34.700 169.000 38.150 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 92.700 47.240 101.700 ;
+        RECT 0.000 45.700 47.240 54.700 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 81.800 47.715 85.050 ;
+        RECT 0.000 34.800 47.715 38.050 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 92.700 1.270 93.030 ;
+        RECT 0.000 45.700 1.270 46.030 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 96.610 47.240 97.790 ;
+        RECT 0.000 49.610 47.240 50.790 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 101.370 1.270 101.700 ;
+        RECT 0.000 54.370 1.270 54.700 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 81.700 47.715 85.150 ;
+        RECT 0.000 34.700 47.715 38.150 ;
     END
   END VSSA
   PIN VDDA
@@ -132,19 +132,19 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 121.205 60.000 169.000 63.250 ;
+        RECT 121.205 13.000 169.000 16.250 ;
     END
     PORT
       LAYER met4 ;
-        RECT 121.205 59.900 169.000 63.350 ;
+        RECT 121.205 12.900 169.000 16.350 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 60.000 47.715 63.250 ;
+        RECT 0.000 13.000 47.715 16.250 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 59.900 47.715 63.350 ;
+        RECT 0.000 12.900 47.715 16.350 ;
     END
   END VDDA
   PIN VSWITCH
@@ -152,19 +152,19 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 125.885 76.950 169.000 80.200 ;
+        RECT 125.885 29.950 169.000 33.200 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 76.850 169.000 80.300 ;
+        RECT 125.885 29.850 169.000 33.300 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 76.950 47.715 80.200 ;
+        RECT 0.000 29.950 47.715 33.200 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 76.850 47.715 80.300 ;
+        RECT 0.000 29.850 47.715 33.300 ;
     END
   END VSWITCH
   PIN VDDIO_Q
@@ -172,19 +172,19 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 125.885 109.150 169.000 113.400 ;
+        RECT 125.885 62.150 169.000 66.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 109.050 169.000 113.500 ;
+        RECT 125.885 62.050 169.000 66.500 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 109.150 47.715 113.400 ;
+        RECT 0.000 62.150 47.715 66.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 109.050 47.715 113.500 ;
+        RECT 0.000 62.050 47.715 66.500 ;
     END
   END VDDIO_Q
   PIN VCCHIB
@@ -192,19 +192,19 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 125.885 47.100 169.000 52.350 ;
+        RECT 125.885 0.100 169.000 5.350 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 47.000 169.000 52.450 ;
+        RECT 125.885 0.000 169.000 5.450 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 47.100 47.715 52.350 ;
+        RECT 0.000 0.100 47.715 5.350 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 47.000 47.715 52.450 ;
+        RECT 0.000 0.000 47.715 5.450 ;
     END
   END VCCHIB
   PIN VDDIO
@@ -212,35 +212,35 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 125.885 115.000 169.000 139.950 ;
+        RECT 125.885 68.000 169.000 92.950 ;
     END
     PORT
       LAYER met5 ;
-        RECT 125.885 64.850 169.000 69.300 ;
+        RECT 125.885 17.850 169.000 22.300 ;
     END
     PORT
       LAYER met4 ;
-        RECT 121.205 64.750 169.000 69.400 ;
+        RECT 121.205 17.750 169.000 22.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 115.000 169.000 139.965 ;
+        RECT 125.885 68.000 169.000 92.965 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 115.000 47.715 139.950 ;
+        RECT 0.000 68.000 47.715 92.950 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 64.850 47.715 69.300 ;
+        RECT 0.000 17.850 47.715 22.300 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 64.750 47.715 69.400 ;
+        RECT 0.000 17.750 47.715 22.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 115.000 47.715 139.965 ;
+        RECT 0.000 68.000 47.715 92.965 ;
     END
   END VDDIO
   PIN VCCD
@@ -248,19 +248,19 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 125.885 53.950 169.000 58.400 ;
+        RECT 125.885 6.950 169.000 11.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 53.850 169.000 58.500 ;
+        RECT 125.885 6.850 169.000 11.500 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 53.950 47.715 58.400 ;
+        RECT 0.000 6.950 47.715 11.400 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 53.850 47.715 58.500 ;
+        RECT 0.000 6.850 47.715 11.500 ;
     END
   END VCCD
   PIN VSSIO
@@ -268,43 +268,43 @@
     USE GROUND ;
     PORT
       LAYER met4 ;
-        RECT 128.245 220.750 169.000 244.965 ;
+        RECT 128.245 173.750 169.000 197.965 ;
     END
     PORT
       LAYER met4 ;
-        RECT 168.360 236.565 168.370 236.575 ;
+        RECT 168.360 189.565 168.370 189.575 ;
     END
     PORT
       LAYER met5 ;
-        RECT 125.885 70.900 169.000 75.350 ;
+        RECT 125.885 23.900 169.000 28.350 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 70.800 169.000 75.450 ;
+        RECT 125.885 23.800 169.000 28.450 ;
     END
     PORT
       LAYER met4 ;
-        RECT 167.730 220.750 169.000 244.965 ;
+        RECT 167.730 173.750 169.000 197.965 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 220.750 48.205 244.965 ;
+        RECT 0.000 173.750 48.205 197.965 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.630 236.565 0.640 236.575 ;
+        RECT 0.630 189.565 0.640 189.575 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 70.900 47.715 75.350 ;
+        RECT 0.000 23.900 47.715 28.350 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 220.750 1.270 244.965 ;
+        RECT 0.000 173.750 1.270 197.965 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 70.800 47.715 75.450 ;
+        RECT 0.000 23.800 47.715 28.450 ;
     END
   END VSSIO
   PIN VSSD
@@ -312,19 +312,19 @@
     USE GROUND ;
     PORT
       LAYER met5 ;
-        RECT 125.885 86.650 169.000 91.100 ;
+        RECT 125.885 39.650 169.000 44.100 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 86.550 169.000 91.200 ;
+        RECT 125.885 39.550 169.000 44.200 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 86.650 47.715 91.100 ;
+        RECT 0.000 39.650 47.715 44.100 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 86.550 47.250 91.200 ;
+        RECT 0.000 39.550 47.250 44.200 ;
     END
   END VSSD
   PIN VSSIO_Q
@@ -332,88 +332,88 @@
     USE GROUND ;
     PORT
       LAYER met5 ;
-        RECT 125.885 103.300 169.000 107.550 ;
+        RECT 125.885 56.300 169.000 60.550 ;
     END
     PORT
       LAYER met4 ;
-        RECT 125.885 103.200 169.000 107.650 ;
+        RECT 125.885 56.200 169.000 60.650 ;
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 103.300 47.715 107.550 ;
+        RECT 0.000 56.300 47.715 60.550 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 103.200 47.715 107.650 ;
+        RECT 0.000 56.200 47.715 60.650 ;
     END
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 50.495 45.900 58.285 68.755 ;
+        RECT 50.495 -1.100 58.285 21.755 ;
       LAYER nwell ;
-        RECT 58.860 45.650 117.965 47.170 ;
+        RECT 58.860 -1.350 117.965 0.170 ;
       LAYER li1 ;
-        RECT 47.610 47.000 119.855 244.660 ;
-        RECT 47.610 46.030 58.155 47.000 ;
-        RECT 59.035 46.885 60.045 47.000 ;
-        RECT 116.730 46.885 117.680 47.000 ;
-        RECT 59.035 45.935 117.680 46.885 ;
+        RECT 47.610 0.000 119.855 197.660 ;
+        RECT 47.610 -0.970 58.155 0.000 ;
+        RECT 59.035 -0.115 60.045 0.000 ;
+        RECT 116.730 -0.115 117.680 0.000 ;
+        RECT 59.035 -1.065 117.680 -0.115 ;
       LAYER met1 ;
-        RECT 47.185 47.000 119.915 244.690 ;
-        RECT 50.625 46.095 55.855 47.000 ;
-        RECT 59.035 46.885 60.350 47.000 ;
-        POLYGON 60.350 47.000 60.465 46.885 60.350 46.885 ;
-        POLYGON 116.540 47.000 116.540 46.885 116.425 46.885 ;
-        RECT 116.540 46.885 117.680 47.000 ;
-        RECT 59.035 45.935 117.680 46.885 ;
+        RECT 47.185 0.000 119.915 197.690 ;
+        RECT 50.625 -0.905 55.855 0.000 ;
+        RECT 59.035 -0.115 60.350 0.000 ;
+        POLYGON 60.350 0.000 60.465 -0.115 60.350 -0.115 ;
+        POLYGON 116.540 0.000 116.540 -0.115 116.425 -0.115 ;
+        RECT 116.540 -0.115 117.680 0.000 ;
+        RECT 59.035 -1.065 117.680 -0.115 ;
       LAYER met2 ;
-        RECT 47.265 70.905 121.290 240.040 ;
-        RECT 47.265 47.300 97.110 70.905 ;
-        RECT 71.675 47.000 97.110 47.300 ;
-        RECT 72.895 44.965 74.895 46.885 ;
+        RECT 47.265 23.905 121.290 193.040 ;
+        RECT 47.265 0.300 97.110 23.905 ;
+        RECT 71.675 0.000 97.110 0.300 ;
+        RECT 72.895 -2.035 74.895 -0.115 ;
       LAYER met3 ;
-        RECT 0.000 61.050 169.000 244.965 ;
-        RECT 71.795 56.695 96.990 61.050 ;
-        RECT 71.795 48.090 84.490 56.695 ;
-        RECT 71.795 47.690 72.495 48.090 ;
-        RECT 84.295 47.690 84.490 48.090 ;
-        RECT 96.290 47.690 96.990 56.695 ;
+        RECT 0.000 14.050 169.000 197.965 ;
+        RECT 71.795 9.695 96.990 14.050 ;
+        RECT 71.795 1.090 84.490 9.695 ;
+        RECT 71.795 0.690 72.495 1.090 ;
+        RECT 84.295 0.690 84.490 1.090 ;
+        RECT 96.290 0.690 96.990 9.695 ;
       LAYER met4 ;
-        RECT 48.605 220.350 127.845 244.965 ;
-        RECT 47.240 140.365 128.245 220.350 ;
-        RECT 48.115 114.600 125.485 140.365 ;
-        RECT 47.240 113.900 128.245 114.600 ;
-        RECT 48.115 108.650 125.485 113.900 ;
-        RECT 47.240 108.050 128.245 108.650 ;
-        RECT 48.115 102.800 125.485 108.050 ;
-        RECT 47.240 102.100 128.245 102.800 ;
-        RECT 47.640 96.710 125.485 97.690 ;
-        RECT 47.240 91.600 128.245 92.300 ;
-        RECT 47.650 86.150 125.485 91.600 ;
-        RECT 47.240 85.550 128.245 86.150 ;
-        RECT 48.115 81.300 125.485 85.550 ;
-        RECT 47.240 80.700 128.245 81.300 ;
-        RECT 48.115 76.450 125.485 80.700 ;
-        RECT 47.240 75.850 128.245 76.450 ;
-        RECT 48.115 70.400 125.485 75.850 ;
-        RECT 47.240 69.800 128.245 70.400 ;
-        RECT 48.115 64.350 120.805 69.800 ;
-        RECT 47.240 63.750 128.245 64.350 ;
-        RECT 48.115 59.500 120.805 63.750 ;
-        RECT 47.240 58.900 128.245 59.500 ;
-        RECT 48.115 53.450 125.485 58.900 ;
-        RECT 47.240 52.850 128.245 53.450 ;
-        RECT 48.115 47.000 125.485 52.850 ;
+        RECT 48.605 173.350 127.845 197.965 ;
+        RECT 47.240 93.365 128.245 173.350 ;
+        RECT 48.115 67.600 125.485 93.365 ;
+        RECT 47.240 66.900 128.245 67.600 ;
+        RECT 48.115 61.650 125.485 66.900 ;
+        RECT 47.240 61.050 128.245 61.650 ;
+        RECT 48.115 55.800 125.485 61.050 ;
+        RECT 47.240 55.100 128.245 55.800 ;
+        RECT 47.640 49.710 125.485 50.690 ;
+        RECT 47.240 44.600 128.245 45.300 ;
+        RECT 47.650 39.150 125.485 44.600 ;
+        RECT 47.240 38.550 128.245 39.150 ;
+        RECT 48.115 34.300 125.485 38.550 ;
+        RECT 47.240 33.700 128.245 34.300 ;
+        RECT 48.115 29.450 125.485 33.700 ;
+        RECT 47.240 28.850 128.245 29.450 ;
+        RECT 48.115 23.400 125.485 28.850 ;
+        RECT 47.240 22.800 128.245 23.400 ;
+        RECT 48.115 17.350 120.805 22.800 ;
+        RECT 47.240 16.750 128.245 17.350 ;
+        RECT 48.115 12.500 120.805 16.750 ;
+        RECT 47.240 11.900 128.245 12.500 ;
+        RECT 48.115 6.450 125.485 11.900 ;
+        RECT 47.240 5.850 128.245 6.450 ;
+        RECT 48.115 0.000 125.485 5.850 ;
       LAYER met5 ;
-        RECT 0.000 212.510 169.000 244.965 ;
-        RECT 0.000 148.485 52.450 212.510 ;
-        RECT 116.490 148.485 169.000 212.510 ;
-        RECT 0.000 141.550 169.000 148.485 ;
-        RECT 49.315 101.700 124.285 141.550 ;
-        RECT 48.840 92.700 124.285 101.700 ;
-        RECT 49.315 64.850 124.285 92.700 ;
-        RECT 49.315 58.400 119.605 64.850 ;
-        RECT 49.315 47.100 124.285 58.400 ;
+        RECT 0.000 165.510 169.000 197.965 ;
+        RECT 0.000 101.485 52.450 165.510 ;
+        RECT 116.490 101.485 169.000 165.510 ;
+        RECT 0.000 94.550 169.000 101.485 ;
+        RECT 49.315 54.700 124.285 94.550 ;
+        RECT 48.840 45.700 124.285 54.700 ;
+        RECT 49.315 17.850 124.285 45.700 ;
+        RECT 49.315 11.400 119.605 17.850 ;
+        RECT 49.315 0.100 124.285 11.400 ;
   END
 END sky130_ef_io__top_power_hvc
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
new file mode 100644
index 0000000..6fad1b9
--- /dev/null
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
@@ -0,0 +1,561 @@
+MACRO sky130_fd_io__top_gpio_ovtv2
+  CLASS BLOCK ;
+  FOREIGN sky130_fd_io__top_gpio_ovtv2 ;
+  ORIGIN 0.400 0.735 ;
+  SIZE 141.455 BY 201.490 ;
+  PIN VSSIO_Q
+    PORT
+      LAYER met5 ;
+        RECT 138.730 58.335 140.000 62.585 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 58.335 1.270 62.585 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 58.235 140.000 62.685 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 58.235 1.270 62.685 ;
+    END
+  END VSSIO_Q
+  PIN VSWITCH
+    PORT
+      LAYER met5 ;
+        RECT 138.730 31.985 140.000 35.235 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 31.985 1.270 35.235 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 31.885 140.000 35.335 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 31.885 1.270 35.335 ;
+    END
+  END VSWITCH
+  PIN VSSIO
+    PORT
+      LAYER met5 ;
+        RECT 138.730 25.935 140.000 30.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 138.730 175.785 140.000 200.000 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 25.935 1.270 30.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 175.785 1.365 200.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 175.785 140.000 200.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 25.835 140.000 30.485 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 175.785 1.365 200.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 25.835 1.270 30.485 ;
+    END
+  END VSSIO
+  PIN VSSD
+    PORT
+      LAYER met5 ;
+        RECT 138.730 41.685 140.000 46.135 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 41.685 1.270 46.135 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 41.585 140.000 46.235 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 41.585 1.270 46.235 ;
+    END
+  END VSSD
+  PIN VSSA
+    PORT
+      LAYER met5 ;
+        RECT 138.730 36.840 140.000 40.085 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 138.730 47.735 140.000 56.735 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 36.840 1.270 40.085 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 47.735 2.040 56.735 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 51.645 140.000 52.825 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 47.735 140.000 48.065 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 56.405 140.000 56.735 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 36.735 140.000 40.185 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 51.645 2.040 52.825 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 47.735 1.270 48.065 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 56.405 1.270 56.735 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 36.735 1.270 40.185 ;
+    END
+  END VSSA
+  PIN VDDIO_Q
+    PORT
+      LAYER met5 ;
+        RECT 138.730 64.185 140.000 68.435 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 64.185 1.270 68.435 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 64.085 140.000 68.535 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 64.085 1.270 68.535 ;
+    END
+  END VDDIO_Q
+  PIN VDDIO
+    PORT
+      LAYER met5 ;
+        RECT 138.730 70.035 140.000 94.985 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 138.730 19.885 140.000 24.335 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 70.035 1.270 94.985 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 19.885 1.270 24.335 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 19.785 140.000 24.435 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 70.035 140.000 95.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 19.785 1.270 24.435 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 70.035 1.270 95.000 ;
+    END
+  END VDDIO
+  PIN VDDA
+    PORT
+      LAYER met5 ;
+        RECT 139.035 15.035 140.000 18.285 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 15.035 0.965 18.285 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 139.035 14.935 140.000 18.385 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 14.935 0.965 18.385 ;
+    END
+  END VDDA
+  PIN VCCHIB
+    PORT
+      LAYER met5 ;
+        RECT 138.730 2.135 140.000 7.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 2.135 1.270 7.385 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 2.035 140.000 7.485 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 2.035 1.270 7.485 ;
+    END
+  END VCCHIB
+  PIN VCCD
+    PORT
+      LAYER met5 ;
+        RECT 138.730 8.985 140.000 13.435 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 8.985 1.270 13.435 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 138.730 8.885 140.000 13.535 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 8.885 1.270 13.535 ;
+    END
+  END VCCD
+  PIN PAD
+    PORT
+      LAYER met5 ;
+        RECT 17.930 117.530 86.325 162.905 ;
+    END
+  END PAD
+  PIN AMUXBUS_A
+    PORT
+      LAYER met4 ;
+        RECT 48.930 53.125 140.000 56.105 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 53.125 38.675 56.105 ;
+    END
+  END AMUXBUS_A
+  PIN AMUXBUS_B
+    PORT
+      LAYER met4 ;
+        RECT 99.710 48.365 140.000 51.345 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 48.365 85.865 51.345 ;
+    END
+  END AMUXBUS_B
+  PIN DM[0]
+    PORT
+      LAYER met3 ;
+        RECT 129.125 0.000 129.455 20.955 ;
+    END
+  END DM[0]
+  PIN DM[1]
+    PORT
+      LAYER met3 ;
+        RECT 128.275 0.000 128.605 20.180 ;
+    END
+  END DM[1]
+  PIN DM[2]
+    PORT
+      LAYER met3 ;
+        RECT 108.395 0.000 108.725 20.640 ;
+    END
+  END DM[2]
+  PIN INP_DIS
+    PORT
+      LAYER met3 ;
+        RECT 107.545 0.000 107.875 8.060 ;
+    END
+  END INP_DIS
+  PIN VTRIP_SEL
+    PORT
+      LAYER met3 ;
+        RECT 87.665 0.000 87.995 20.980 ;
+    END
+  END VTRIP_SEL
+  PIN IB_MODE_SEL[0]
+    PORT
+      LAYER met3 ;
+        RECT 86.815 0.000 87.145 20.980 ;
+    END
+  END IB_MODE_SEL[0]
+  PIN IB_MODE_SEL[1]
+    PORT
+      LAYER met3 ;
+        RECT 66.935 0.000 67.265 20.980 ;
+    END
+  END IB_MODE_SEL[1]
+  PIN SLEW_CTL[0]
+    PORT
+      LAYER met3 ;
+        RECT 66.085 0.000 66.415 20.980 ;
+    END
+  END SLEW_CTL[0]
+  PIN SLEW_CTL[1]
+    PORT
+      LAYER met3 ;
+        RECT 46.205 0.000 46.535 20.980 ;
+    END
+  END SLEW_CTL[1]
+  PIN HYS_TRIM
+    PORT
+      LAYER met3 ;
+        RECT 45.355 0.000 45.685 8.060 ;
+    END
+  END HYS_TRIM
+  PIN HLD_OVR
+    PORT
+      LAYER met3 ;
+        RECT 27.355 0.000 27.685 14.055 ;
+    END
+  END HLD_OVR
+  PIN ENABLE_H
+    PORT
+      LAYER met3 ;
+        RECT 22.135 0.000 22.465 30.150 ;
+    END
+  END ENABLE_H
+  PIN HLD_H_N
+    PORT
+      LAYER met3 ;
+        RECT 19.635 0.000 19.965 17.985 ;
+    END
+  END HLD_H_N
+  PIN ENABLE_VDDA_H
+    PORT
+      LAYER met3 ;
+        RECT 8.770 0.000 9.100 7.915 ;
+    END
+  END ENABLE_VDDA_H
+  PIN ANALOG_EN
+    PORT
+      LAYER met3 ;
+        RECT 8.115 0.000 8.445 14.070 ;
+    END
+  END ANALOG_EN
+  PIN ENABLE_INP_H
+    PORT
+      LAYER met3 ;
+        RECT 7.110 0.000 7.440 0.670 ;
+    END
+  END ENABLE_INP_H
+  PIN IN
+    PORT
+      LAYER met3 ;
+        RECT 20.380 0.000 20.710 11.310 ;
+    END
+  END IN
+  PIN IN_H
+    PORT
+      LAYER met3 ;
+        RECT 24.380 0.000 24.710 0.940 ;
+    END
+  END IN_H
+  PIN VINREF
+    PORT
+      LAYER met3 ;
+        RECT 44.035 0.000 44.365 4.885 ;
+    END
+  END VINREF
+  PIN OUT
+    PORT
+      LAYER met3 ;
+        RECT 74.125 0.000 74.455 14.865 ;
+    END
+  END OUT
+  PIN ANALOG_POL
+    PORT
+      LAYER met3 ;
+        RECT 65.235 0.000 65.565 1.165 ;
+    END
+  END ANALOG_POL
+  PIN ANALOG_SEL
+    PORT
+      LAYER met3 ;
+        RECT 51.655 0.000 51.985 8.060 ;
+    END
+  END ANALOG_SEL
+  PIN SLOW
+    PORT
+      LAYER met3 ;
+        RECT 125.140 0.000 125.470 11.965 ;
+    END
+  END SLOW
+  PIN OE_N
+    PORT
+      LAYER met3 ;
+        RECT 124.445 0.000 124.775 8.060 ;
+    END
+  END OE_N
+  PIN TIE_HI_ESD
+    PORT
+      LAYER met3 ;
+        RECT 129.975 0.000 130.305 61.655 ;
+    END
+  END TIE_HI_ESD
+  PIN TIE_LO_ESD
+    PORT
+      LAYER met3 ;
+        RECT 115.290 0.000 115.890 39.035 ;
+    END
+  END TIE_LO_ESD
+  PIN PAD_A_ESD_0_H
+    PORT
+      LAYER met3 ;
+        RECT 1.600 0.000 2.200 5.470 ;
+    END
+  END PAD_A_ESD_0_H
+  PIN PAD_A_ESD_1_H
+    PORT
+      LAYER met3 ;
+        RECT 0.330 0.000 0.930 71.380 ;
+    END
+  END PAD_A_ESD_1_H
+  PIN PAD_A_NOESD_H
+    PORT
+      LAYER met3 ;
+        RECT 2.885 0.000 3.485 5.900 ;
+    END
+  END PAD_A_NOESD_H
+  PIN ENABLE_VSWITCH_H
+    PORT
+      LAYER met3 ;
+        RECT 5.765 0.000 6.365 12.470 ;
+    END
+  END ENABLE_VSWITCH_H
+  PIN ENABLE_VDDIO
+    PORT
+      LAYER met3 ;
+        RECT 95.845 0.000 96.215 20.755 ;
+    END
+  END ENABLE_VDDIO
+  OBS
+      LAYER nwell ;
+        RECT -0.400 10.495 11.880 11.925 ;
+        RECT -0.400 1.430 1.030 10.495 ;
+        RECT -0.400 0.000 11.880 1.430 ;
+      LAYER li1 ;
+        RECT 0.230 0.200 140.475 199.780 ;
+      LAYER met1 ;
+        RECT 0.080 0.000 140.475 199.810 ;
+      LAYER met2 ;
+        RECT 0.080 0.000 140.325 199.955 ;
+      LAYER met3 ;
+        RECT 0.330 71.780 140.000 199.715 ;
+        RECT 1.330 62.055 140.000 71.780 ;
+        RECT 1.330 39.435 129.575 62.055 ;
+        RECT 1.330 30.550 114.890 39.435 ;
+        RECT 1.330 18.385 21.735 30.550 ;
+        RECT 1.330 14.470 19.235 18.385 ;
+        RECT 1.330 12.870 7.715 14.470 ;
+        RECT 1.330 6.300 5.365 12.870 ;
+        RECT 1.330 5.870 2.485 6.300 ;
+        RECT 3.885 0.000 5.365 6.300 ;
+        RECT 6.765 1.070 7.715 12.870 ;
+        RECT 8.845 8.315 19.235 14.470 ;
+        RECT 20.365 11.710 21.735 18.385 ;
+        RECT 9.500 0.000 19.235 8.315 ;
+        RECT 21.110 0.000 21.735 11.710 ;
+        RECT 22.865 21.380 114.890 30.550 ;
+        RECT 22.865 14.455 45.805 21.380 ;
+        RECT 22.865 1.340 26.955 14.455 ;
+        RECT 22.865 0.000 23.980 1.340 ;
+        RECT 25.110 0.000 26.955 1.340 ;
+        RECT 28.085 8.460 45.805 14.455 ;
+        RECT 46.935 8.460 65.685 21.380 ;
+        RECT 28.085 5.285 44.955 8.460 ;
+        RECT 28.085 0.000 43.635 5.285 ;
+        RECT 44.765 0.000 44.955 5.285 ;
+        RECT 46.935 0.000 51.255 8.460 ;
+        RECT 52.385 1.565 65.685 8.460 ;
+        RECT 67.665 15.265 86.415 21.380 ;
+        RECT 52.385 0.000 64.835 1.565 ;
+        RECT 67.665 0.000 73.725 15.265 ;
+        RECT 74.855 0.000 86.415 15.265 ;
+        RECT 88.395 21.155 114.890 21.380 ;
+        RECT 88.395 0.000 95.445 21.155 ;
+        RECT 96.615 21.040 114.890 21.155 ;
+        RECT 96.615 8.460 107.995 21.040 ;
+        RECT 96.615 0.000 107.145 8.460 ;
+        RECT 109.125 0.000 114.890 21.040 ;
+        RECT 116.290 21.355 129.575 39.435 ;
+        RECT 116.290 20.580 128.725 21.355 ;
+        RECT 116.290 12.365 127.875 20.580 ;
+        RECT 116.290 8.460 124.740 12.365 ;
+        RECT 116.290 0.000 124.045 8.460 ;
+        RECT 125.870 0.000 127.875 12.365 ;
+        RECT 130.705 0.000 140.000 62.055 ;
+      LAYER met4 ;
+        RECT 1.765 175.385 138.330 200.000 ;
+        RECT 0.965 95.400 139.035 175.385 ;
+        RECT 1.670 69.635 138.330 95.400 ;
+        RECT 0.965 68.935 139.035 69.635 ;
+        RECT 1.670 63.685 138.330 68.935 ;
+        RECT 0.965 63.085 139.035 63.685 ;
+        RECT 1.670 57.835 138.330 63.085 ;
+        RECT 0.965 57.135 139.035 57.835 ;
+        RECT 39.075 52.725 48.530 56.005 ;
+        RECT 2.440 51.745 138.330 52.725 ;
+        RECT 86.265 48.465 99.310 51.745 ;
+        RECT 0.965 46.635 139.035 47.335 ;
+        RECT 1.670 41.185 138.330 46.635 ;
+        RECT 0.965 40.585 139.035 41.185 ;
+        RECT 1.670 36.335 138.330 40.585 ;
+        RECT 0.965 35.735 139.035 36.335 ;
+        RECT 1.670 31.485 138.330 35.735 ;
+        RECT 0.965 30.885 139.035 31.485 ;
+        RECT 1.670 25.435 138.330 30.885 ;
+        RECT 0.965 24.835 139.035 25.435 ;
+        RECT 1.670 19.385 138.330 24.835 ;
+        RECT 0.965 18.785 139.035 19.385 ;
+        RECT 1.365 14.535 138.635 18.785 ;
+        RECT 0.965 13.935 139.035 14.535 ;
+        RECT 1.670 8.485 138.330 13.935 ;
+        RECT 0.965 7.885 139.035 8.485 ;
+        RECT 1.670 1.635 138.330 7.885 ;
+        RECT 0.965 1.160 139.035 1.635 ;
+      LAYER met5 ;
+        RECT 2.965 174.185 137.130 200.000 ;
+        RECT 0.000 164.505 140.000 174.185 ;
+        RECT 0.000 115.930 16.330 164.505 ;
+        RECT 87.925 115.930 140.000 164.505 ;
+        RECT 0.000 96.585 140.000 115.930 ;
+        RECT 2.870 58.335 137.130 96.585 ;
+        RECT 3.640 46.135 137.130 58.335 ;
+        RECT 2.870 18.285 137.130 46.135 ;
+        RECT 2.565 15.035 137.435 18.285 ;
+        RECT 2.870 2.135 137.130 15.035 ;
+  END
+END sky130_fd_io__top_gpio_ovtv2
+END LIBRARY
+
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
new file mode 100644
index 0000000..deda14f
--- /dev/null
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
@@ -0,0 +1,477 @@
+MACRO sky130_fd_io__top_xres4v2
+  CLASS BLOCK ;
+  FOREIGN sky130_fd_io__top_xres4v2 ;
+  ORIGIN 0.515 0.000 ;
+  SIZE 76.135 BY 200.000 ;
+  PIN PAD_A_ESD_H
+    PORT
+      LAYER met3 ;
+        RECT 17.245 0.000 18.910 0.565 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 17.245 0.000 18.910 0.565 ;
+    END
+  END PAD_A_ESD_H
+  PIN XRES_H_N
+    PORT
+      LAYER met3 ;
+        RECT 28.935 0.000 29.665 0.330 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.935 0.000 29.665 0.330 ;
+    END
+  END XRES_H_N
+  PIN FILT_IN_H
+    PORT
+      LAYER met3 ;
+        RECT 20.075 0.000 21.225 1.410 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 20.075 0.000 21.225 1.410 ;
+    END
+  END FILT_IN_H
+  PIN ENABLE_VDDIO
+    PORT
+      LAYER met3 ;
+        RECT 8.400 0.000 8.920 0.330 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 8.425 0.000 8.895 0.330 ;
+    END
+  END ENABLE_VDDIO
+  PIN TIE_WEAK_HI_H
+    PORT
+      LAYER met3 ;
+        RECT 72.190 0.000 73.260 0.330 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 72.215 0.000 73.235 0.330 ;
+    END
+  END TIE_WEAK_HI_H
+  PIN ENABLE_H
+    PORT
+      LAYER met2 ;
+        RECT 12.285 0.000 12.545 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 12.285 0.000 12.545 0.330 ;
+    END
+  END ENABLE_H
+  PIN PULLUP_H
+    PORT
+      LAYER met2 ;
+        RECT 14.555 0.000 15.135 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 14.555 0.000 15.135 0.330 ;
+    END
+  END PULLUP_H
+  PIN EN_VDDIO_SIG_H
+    PORT
+      LAYER met2 ;
+        RECT 22.360 0.000 22.660 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 22.360 0.000 22.660 0.330 ;
+    END
+  END EN_VDDIO_SIG_H
+  PIN TIE_LO_ESD
+    PORT
+      LAYER met2 ;
+        RECT 27.580 0.000 28.230 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 27.580 0.000 28.230 0.330 ;
+    END
+  END TIE_LO_ESD
+  PIN TIE_HI_ESD
+    PORT
+      LAYER met2 ;
+        RECT 30.505 0.000 31.155 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 30.505 0.000 31.155 0.330 ;
+    END
+  END TIE_HI_ESD
+  PIN DISABLE_PULLUP_H
+    PORT
+      LAYER met2 ;
+        RECT 32.760 0.000 33.020 0.330 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 32.760 0.000 33.020 0.330 ;
+    END
+  END DISABLE_PULLUP_H
+  PIN INP_SEL_H
+    PORT
+      LAYER met1 ;
+        RECT 24.905 0.000 25.135 9.975 ;
+    END
+  END INP_SEL_H
+  PIN VSSIO
+    PORT
+      LAYER met4 ;
+        RECT 0.000 175.785 1.270 200.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 73.730 25.835 75.000 30.485 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 73.730 175.785 75.000 200.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 25.835 1.270 30.485 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 175.785 1.270 200.000 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 25.935 75.000 30.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 175.785 75.000 200.000 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 25.935 1.270 30.385 ;
+    END
+  END VSSIO
+  PIN VSSA
+    PORT
+      LAYER met4 ;
+        RECT 73.730 36.735 75.000 40.185 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 56.405 75.000 56.735 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 47.735 75.000 48.065 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 73.730 51.645 75.000 52.825 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 36.735 1.270 40.185 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 56.405 1.270 56.735 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 47.735 1.270 48.065 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 51.645 1.270 52.825 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 47.735 75.000 56.735 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 36.840 75.000 40.085 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 36.840 1.270 40.085 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 47.735 1.270 56.735 ;
+    END
+  END VSSA
+  PIN VSSD
+    PORT
+      LAYER met4 ;
+        RECT 73.730 41.585 75.000 46.235 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 41.585 1.270 46.235 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 41.685 75.000 46.135 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 41.685 1.270 46.135 ;
+    END
+  END VSSD
+  PIN AMUXBUS_B
+    PORT
+      LAYER met4 ;
+        RECT 0.000 48.365 75.000 51.345 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 48.365 1.270 51.345 ;
+    END
+  END AMUXBUS_B
+  PIN AMUXBUS_A
+    PORT
+      LAYER met4 ;
+        RECT 0.000 53.125 75.000 56.105 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 53.125 1.270 56.105 ;
+    END
+  END AMUXBUS_A
+  PIN VDDIO_Q
+    PORT
+      LAYER met4 ;
+        RECT 73.730 64.085 75.000 68.535 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 64.085 1.270 68.535 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 64.185 75.000 68.435 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 64.185 1.270 68.435 ;
+    END
+  END VDDIO_Q
+  PIN VDDIO
+    PORT
+      LAYER met4 ;
+        RECT 73.730 70.035 75.000 95.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 73.730 19.785 75.000 24.435 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 70.035 1.270 95.000 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 19.785 1.270 24.435 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 19.885 75.000 24.335 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 70.035 75.000 94.985 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 70.035 1.270 94.985 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 19.885 1.270 24.335 ;
+    END
+  END VDDIO
+  PIN VSWITCH
+    PORT
+      LAYER met4 ;
+        RECT 73.730 31.885 75.000 35.335 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 31.885 1.270 35.335 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 31.985 75.000 35.235 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 31.985 1.270 35.235 ;
+    END
+  END VSWITCH
+  PIN VDDA
+    PORT
+      LAYER met4 ;
+        RECT 74.035 14.935 75.000 18.385 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 14.935 0.965 18.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 74.035 15.035 75.000 18.285 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 15.035 0.965 18.285 ;
+    END
+  END VDDA
+  PIN VCCD
+    PORT
+      LAYER met4 ;
+        RECT 73.730 8.885 75.000 13.535 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 8.885 1.270 13.535 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 8.985 75.000 13.435 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 8.985 1.270 13.435 ;
+    END
+  END VCCD
+  PIN VCCHIB
+    PORT
+      LAYER met4 ;
+        RECT 73.730 2.035 75.000 7.485 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 2.035 1.270 7.485 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 2.135 75.000 7.385 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 2.135 1.270 7.385 ;
+    END
+  END VCCHIB
+  PIN VSSIO_Q
+    PORT
+      LAYER met4 ;
+        RECT 73.730 58.235 75.000 62.685 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 0.000 58.235 1.270 62.685 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 73.730 58.335 75.000 62.585 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 0.000 58.335 1.270 62.585 ;
+    END
+  END VSSIO_Q
+  PIN PAD
+    PORT
+      LAYER met5 ;
+        RECT 17.250 108.455 54.435 164.285 ;
+    END
+  END PAD
+  OBS
+      LAYER nwell ;
+        RECT -0.515 168.515 75.620 170.210 ;
+        RECT -0.515 146.690 1.675 168.515 ;
+        RECT -0.515 144.880 75.620 146.690 ;
+      LAYER li1 ;
+        RECT -0.265 0.185 75.160 199.220 ;
+      LAYER met1 ;
+        RECT -0.145 10.255 75.145 199.210 ;
+        RECT -0.145 0.610 24.625 10.255 ;
+        RECT -0.145 0.185 12.005 0.610 ;
+        RECT 12.825 0.185 14.275 0.610 ;
+        RECT 15.415 0.185 22.080 0.610 ;
+        RECT 22.940 0.185 24.625 0.610 ;
+        RECT 25.415 0.610 75.145 10.255 ;
+        RECT 25.415 0.185 27.300 0.610 ;
+        RECT 28.510 0.185 30.225 0.610 ;
+        RECT 31.435 0.185 32.480 0.610 ;
+        RECT 33.300 0.185 75.145 0.610 ;
+      LAYER met2 ;
+        RECT 0.340 1.690 74.915 199.210 ;
+        RECT 0.340 0.845 19.795 1.690 ;
+        RECT 0.340 0.610 16.965 0.845 ;
+        RECT 0.340 0.000 8.145 0.610 ;
+        RECT 9.175 0.000 12.005 0.610 ;
+        RECT 12.825 0.000 14.275 0.610 ;
+        RECT 15.415 0.000 16.965 0.610 ;
+        RECT 19.190 0.000 19.795 0.845 ;
+        RECT 21.505 0.610 74.915 1.690 ;
+        RECT 21.505 0.000 22.080 0.610 ;
+        RECT 22.940 0.000 27.300 0.610 ;
+        RECT 28.510 0.000 28.655 0.610 ;
+        RECT 29.945 0.000 30.225 0.610 ;
+        RECT 31.435 0.000 32.480 0.610 ;
+        RECT 33.300 0.000 71.935 0.610 ;
+        RECT 73.515 0.000 74.915 0.610 ;
+      LAYER met3 ;
+        RECT 0.965 1.810 74.700 200.000 ;
+        RECT 0.965 0.965 19.675 1.810 ;
+        RECT 0.965 0.730 16.845 0.965 ;
+        RECT 0.965 0.330 8.000 0.730 ;
+        RECT 9.320 0.330 16.845 0.730 ;
+        RECT 19.310 0.330 19.675 0.965 ;
+        RECT 21.625 0.730 74.700 1.810 ;
+        RECT 21.625 0.330 28.535 0.730 ;
+        RECT 30.065 0.330 71.790 0.730 ;
+        RECT 73.660 0.330 74.700 0.730 ;
+      LAYER met4 ;
+        RECT 1.670 175.385 73.330 200.000 ;
+        RECT 0.965 95.400 74.035 175.385 ;
+        RECT 1.670 69.635 73.330 95.400 ;
+        RECT 0.965 68.935 74.035 69.635 ;
+        RECT 1.670 63.685 73.330 68.935 ;
+        RECT 0.965 63.085 74.035 63.685 ;
+        RECT 1.670 57.835 73.330 63.085 ;
+        RECT 0.965 57.135 74.035 57.835 ;
+        RECT 1.670 51.745 73.330 52.725 ;
+        RECT 0.965 46.635 74.035 47.335 ;
+        RECT 1.670 41.185 73.330 46.635 ;
+        RECT 0.965 40.585 74.035 41.185 ;
+        RECT 1.670 36.335 73.330 40.585 ;
+        RECT 0.965 35.735 74.035 36.335 ;
+        RECT 1.670 31.485 73.330 35.735 ;
+        RECT 0.965 30.885 74.035 31.485 ;
+        RECT 1.670 25.435 73.330 30.885 ;
+        RECT 0.965 24.835 74.035 25.435 ;
+        RECT 1.670 19.385 73.330 24.835 ;
+        RECT 0.965 18.785 74.035 19.385 ;
+        RECT 1.365 14.535 73.635 18.785 ;
+        RECT 0.965 13.935 74.035 14.535 ;
+        RECT 1.670 8.485 73.330 13.935 ;
+        RECT 0.965 7.885 74.035 8.485 ;
+        RECT 1.670 2.035 73.330 7.885 ;
+      LAYER met5 ;
+        RECT 2.870 174.185 72.130 200.000 ;
+        RECT 0.000 165.885 75.000 174.185 ;
+        RECT 0.000 106.855 15.650 165.885 ;
+        RECT 56.035 106.855 75.000 165.885 ;
+        RECT 0.000 96.585 75.000 106.855 ;
+        RECT 2.870 18.285 72.130 96.585 ;
+        RECT 2.565 15.035 72.435 18.285 ;
+        RECT 2.870 2.135 72.130 15.035 ;
+  END
+END sky130_fd_io__top_xres4v2
+END LIBRARY
+
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io.mag
index 49cdab3..e3e762d 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io.mag
@@ -1,9 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1622214725
+timestamp 1624544534
 use sky130_ef_io__vddio_hvc_clamped_pad  sky130_ef_io__vddio_hvc_clamped_pad_0
-timestamp 1622214725
+timestamp 1624544022
 transform 1 0 -778 0 1 -5714
 box 0 -434 15000 39593
 use sky130_ef_io__vdda_hvc_clamped_pad  sky130_ef_io__vdda_hvc_clamped_pad_0
@@ -31,9 +31,13 @@
 transform 1 0 118340 0 1 -5714
 box 0 -2107 17239 39593
 use sky130_ef_io__vssd_lvc_clamped2_pad  sky130_ef_io__vssd_lvc_clamped2_pad_0
-timestamp 1622214725
-transform 1 0 138664 0 1 -6040
-box 0 -2107 17239 39593
+timestamp 1617120349
+transform 1 0 141083 0 1 -5048
+box -2195 -2184 17228 39593
+use sky130_ef_io__top_power_hvc  sky130_ef_io__top_power_hvc_0
+timestamp 1624544534
+transform 1 0 163508 0 1 -6325
+box 0 -407 33800 39593
 use sky130_ef_io__vssd_lvc_pad  sky130_ef_io__vssd_lvc_pad_0
 timestamp 1622214725
 transform 1 0 -480 0 1 46173
@@ -114,8 +118,4 @@
 timestamp 1622147639
 transform 1 0 160920 0 1 92540
 box -80 -147 28211 40151
-use sky130_ef_io__top_power_hvc  sky130_ef_io__top_power_hvc_0
-timestamp 1622214725
-transform 1 0 165360 0 1 -16306
-box 0 8966 33800 48993
 << end >>
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__top_power_hvc.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__top_power_hvc.mag
index cf5efc2..efe3685 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__top_power_hvc.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__top_power_hvc.mag
@@ -1,303 +1,332 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1622214379
+timestamp 1624544534
+<< error_s >>
+rect 11669 33953 11682 34189
+rect 11350 33865 11583 33881
+rect 11347 33662 11350 33865
+rect 11030 33545 11147 33561
+rect 11027 33325 11030 33545
+rect 10710 33225 10943 33241
+rect 10707 33130 10710 33225
+rect 22911 33171 23144 33187
+rect 23144 32951 23147 33171
+rect 10387 32902 10615 32918
+rect 10384 32891 10387 32902
+rect 23404 20435 23416 20455
+rect 23180 20428 23404 20435
+rect 10653 20175 10656 20395
+rect 10656 20159 10889 20175
+rect 23090 20121 23093 20341
+rect 22857 20105 23090 20121
+rect 10973 19849 10982 20075
+rect 10982 19839 11209 19849
+rect 22760 19791 22773 20021
+rect 22537 19785 22760 19791
+rect 11293 19535 11296 19755
+rect 11296 19519 11529 19535
+rect 22450 19481 22453 19701
+rect 22217 19465 22450 19481
+rect 11655 19173 11658 19393
+rect 11658 19157 11682 19173
+rect 22118 19157 22131 19393
 << metal2 >>
-rect 9499 8993 14279 9141
-rect 14579 8993 14979 9189
-rect 19478 8993 24258 9141
+rect 9499 -407 14279 -259
+rect 14579 -407 14979 -211
+rect 19478 -407 24258 -259
 << metal3 >>
-tri 0 36705 6919 43624 se
-rect 6919 36705 9579 43624
-rect 0 31925 9579 36705
-rect 0 12130 4307 31925
-tri 4307 31727 4505 31925 nw
-tri 4897 31727 5095 31925 ne
-rect 5095 31727 9579 31925
-tri 5095 31725 5097 31727 ne
-rect 5097 31030 9579 31727
-rect 5096 25948 9579 31030
-tri 5093 12327 5096 12330 se
-rect 5096 12327 8904 25948
-tri 8904 25748 9104 25948 nw
-tri 9299 25748 9499 25948 ne
-rect 9499 25748 9579 25948
-rect 24146 36695 26838 43657
-tri 26838 36695 33800 43657 sw
-rect 24146 31925 33800 36695
-rect 24146 31125 28705 31925
-tri 28705 31725 28905 31925 nw
-tri 29296 31725 29496 31925 ne
-rect 24146 25948 28704 31125
-rect 24146 25748 24258 25948
-tri 24258 25748 24458 25948 nw
-tri 24696 25748 24896 25948 ne
-tri 4307 12130 4504 12327 sw
-tri 4896 12130 5093 12327 se
-rect 5093 12130 8904 12327
-tri 8904 12130 9104 12330 sw
-tri 9299 12130 9499 12330 se
-rect 9499 12130 9579 12330
-rect 0 9384 9579 12130
-rect 24146 12130 24258 12330
-tri 24258 12130 24458 12330 sw
-tri 24696 12130 24896 12330 se
-rect 24896 12130 28704 25948
-tri 28704 12130 28904 12330 sw
-tri 29296 12130 29496 12330 se
-rect 29496 12130 33800 31925
-rect 24146 9384 33800 12130
-rect 0 8993 14279 9384
-rect 14579 8993 16779 9141
-rect 16978 8993 19178 9311
-rect 19478 8993 33800 9384
+tri 0 27305 6919 34224 se
+rect 6919 27305 9579 34224
+rect 0 22525 9579 27305
+rect 0 2730 4307 22525
+tri 4307 22327 4505 22525 nw
+tri 4897 22327 5095 22525 ne
+rect 5095 22327 9579 22525
+tri 5095 22325 5097 22327 ne
+rect 5097 21630 9579 22327
+rect 5096 16548 9579 21630
+tri 5093 2927 5096 2930 se
+rect 5096 2927 8904 16548
+tri 8904 16348 9104 16548 nw
+tri 9299 16348 9499 16548 ne
+rect 9499 16348 9579 16548
+rect 24146 27295 26838 34257
+tri 26838 27295 33800 34257 sw
+rect 24146 22525 33800 27295
+rect 24146 21725 28705 22525
+tri 28705 22325 28905 22525 nw
+tri 29296 22325 29496 22525 ne
+rect 24146 16548 28704 21725
+rect 24146 16348 24258 16548
+tri 24258 16348 24458 16548 nw
+tri 24696 16348 24896 16548 ne
+tri 4307 2730 4504 2927 sw
+tri 4896 2730 5093 2927 se
+rect 5093 2730 8904 2927
+tri 8904 2730 9104 2930 sw
+tri 9299 2730 9499 2930 se
+rect 9499 2730 9579 2930
+rect 0 -16 9579 2730
+rect 24146 2730 24258 2930
+tri 24258 2730 24458 2930 sw
+tri 24696 2730 24896 2930 se
+rect 24896 2730 28704 16548
+tri 28704 2730 28904 2930 sw
+tri 29296 2730 29496 2930 se
+rect 29496 2730 33800 22525
+rect 24146 -16 33800 2730
+rect 0 -407 14279 -16
+rect 14579 -407 16779 -259
+rect 16978 -407 19178 -89
+rect 19478 -407 33800 -16
 << metal4 >>
-rect 0 44150 254 48993
-rect 33546 44150 33800 48993
-rect 0 23000 254 27993
-rect 33546 23000 33800 27993
-rect 0 21810 254 22700
-rect 33546 21810 33800 22700
-rect 0 20640 254 21530
-rect 33546 20640 33800 21530
-rect 0 20274 254 20340
-rect 33546 20274 33800 20340
-rect 0 19618 100 20214
-rect 33546 19618 33646 20214
-rect 0 19322 254 19558
-rect 33546 19322 33800 19558
-rect 0 18666 116 19262
-rect 33546 18666 33662 19262
-rect 0 18540 254 18606
-rect 33546 18540 33800 18606
-rect 0 17310 254 18240
-rect 33546 17310 33800 18240
-rect 0 16340 254 17030
-rect 33546 16340 33800 17030
-rect 0 15370 254 16060
-rect 33546 15370 33800 16060
-rect 0 14160 254 15090
-rect 33546 14160 33800 15090
-rect 0 12950 254 13880
-rect 33546 12950 33800 13880
-rect 0 11980 254 12670
-rect 33546 11980 33800 12670
-rect 0 10770 254 11700
-rect 33546 10770 33800 11700
-rect 0 9400 254 10490
-rect 33546 9400 33800 10490
+rect 0 34750 254 39593
+rect 33546 34750 33800 39593
+rect 0 13600 254 18593
+rect 33546 13600 33800 18593
+rect 0 12410 254 13300
+rect 33546 12410 33800 13300
+rect 0 11240 254 12130
+rect 33546 11240 33800 12130
+rect 0 10874 254 10940
+rect 33546 10874 33800 10940
+rect 0 10218 100 10814
+rect 33546 10218 33646 10814
+rect 0 9922 254 10158
+rect 33546 9922 33800 10158
+rect 0 9266 116 9862
+rect 33546 9266 33662 9862
+rect 0 9140 254 9206
+rect 33546 9140 33800 9206
+rect 0 7910 254 8840
+rect 33546 7910 33800 8840
+rect 0 6940 254 7630
+rect 33546 6940 33800 7630
+rect 0 5970 254 6660
+rect 33546 5970 33800 6660
+rect 0 4760 254 5690
+rect 33546 4760 33800 5690
+rect 0 3550 254 4480
+rect 33546 3550 33800 4480
+rect 0 2580 254 3270
+rect 33546 2580 33800 3270
+rect 0 1370 254 2300
+rect 33546 1370 33800 2300
+rect 0 0 254 1090
+rect 33546 0 33800 1090
 << metal5 >>
-rect 0 44150 254 48993
-rect 33546 44150 33800 48993
-rect 16729 36858 16994 38180
-rect 0 23000 254 27990
-rect 33546 23000 33800 27990
-rect 0 21830 254 22680
-rect 33546 21830 33800 22680
-rect 0 20660 254 21510
-rect 33546 20660 33800 21510
-rect 0 18540 254 20340
-rect 33546 18540 33800 20340
-rect 0 17330 254 18220
-rect 33546 17330 33800 18220
-rect 0 16360 254 17010
-rect 33546 16360 33800 17010
-rect 0 15390 254 16040
-rect 33546 15390 33800 16040
-rect 0 14180 254 15070
-rect 33546 14180 33800 15070
-rect 0 12970 254 13860
-rect 33546 12970 33800 13860
-rect 0 12000 254 12650
-rect 33546 12000 33800 12650
-rect 0 10790 254 11680
-rect 33546 10790 33800 11680
-rect 0 9420 254 10470
-rect 33546 9420 33800 10470
+rect 0 34750 254 39593
+rect 33546 34750 33800 39593
+rect 16729 27458 16994 28780
+rect 0 13600 254 18590
+rect 33546 13600 33800 18590
+rect 0 12430 254 13280
+rect 33546 12430 33800 13280
+rect 0 11260 254 12110
+rect 33546 11260 33800 12110
+rect 0 9140 254 10940
+rect 33546 9140 33800 10940
+rect 0 7930 254 8820
+rect 33546 7930 33800 8820
+rect 0 6960 254 7610
+rect 33546 6960 33800 7610
+rect 0 5990 254 6640
+rect 33546 5990 33800 6640
+rect 0 4780 254 5670
+rect 33546 4780 33800 5670
+rect 0 3570 254 4460
+rect 33546 3570 33800 4460
+rect 0 2600 254 3250
+rect 33546 2600 33800 3250
+rect 0 1390 254 2280
+rect 33546 1390 33800 2280
+rect 0 20 254 1070
+rect 33546 20 33800 1070
 use sky130_ef_io__com_bus_slice_1um  sky130_ef_io__com_bus_slice_1um_2
 timestamp 1576684134
-transform 1 0 0 0 1 9400
+transform 1 0 0 0 1 0
 box 0 0 200 39593
 use sky130_ef_io__com_bus_slice_1um  sky130_ef_io__com_bus_slice_1um_3
 timestamp 1576684134
-transform 1 0 200 0 1 9400
+transform 1 0 200 0 1 0
 box 0 0 200 39593
 use sky130_ef_io__com_bus_slice_5um  sky130_ef_io__com_bus_slice_5um_1
 timestamp 1602609416
-transform 1 0 400 0 1 9400
+transform 1 0 400 0 1 0
 box 0 0 1000 39593
 use sky130_ef_io__com_bus_slice_20um  sky130_ef_io__com_bus_slice_20um_2
 timestamp 1602609570
-transform 1 0 1400 0 1 9400
+transform 1 0 1400 0 1 0
 box 0 0 4000 39593
 use sky130_ef_io__com_bus_slice_20um  sky130_ef_io__com_bus_slice_20um_3
 timestamp 1602609570
-transform 1 0 5400 0 1 9400
+transform 1 0 5400 0 1 0
 box 0 0 4000 39593
 use sky130_fd_io__top_power_hvc_wpadv2  sky130_fd_io__top_power_hvc_wpadv2_1 $PDKPATH/libs.ref/sky130_fd_io/mag
-timestamp 1622147639
-transform 1 0 9400 0 1 8993
+timestamp 1624499932
+transform 1 0 9400 0 1 -407
 box 0 0 15000 40000
 use sky130_ef_io__com_bus_slice_20um  sky130_ef_io__com_bus_slice_20um_0
 timestamp 1602609570
-transform 1 0 24400 0 1 9400
+transform 1 0 24400 0 1 0
 box 0 0 4000 39593
 use sky130_ef_io__com_bus_slice_20um  sky130_ef_io__com_bus_slice_20um_1
 timestamp 1602609570
-transform 1 0 28400 0 1 9400
+transform 1 0 28400 0 1 0
 box 0 0 4000 39593
 use sky130_ef_io__com_bus_slice_5um  sky130_ef_io__com_bus_slice_5um_0
 timestamp 1602609416
-transform 1 0 32400 0 1 9400
+transform 1 0 32400 0 1 0
 box 0 0 1000 39593
 use sky130_ef_io__com_bus_slice_1um  sky130_ef_io__com_bus_slice_1um_0
 timestamp 1576684134
-transform 1 0 33400 0 1 9400
+transform 1 0 33400 0 1 0
 box 0 0 200 39593
 use sky130_ef_io__com_bus_slice_1um  sky130_ef_io__com_bus_slice_1um_1
 timestamp 1576684134
-transform 1 0 33600 0 1 9400
+transform 1 0 33600 0 1 0
 box 0 0 200 39593
 << labels >>
-flabel metal2 s 19478 8993 24258 9141 2 FreeSans 2000 90 0 0 DRN_HVC
+flabel metal2 s 19478 -407 24258 -259 2 FreeSans 2000 90 0 0 DRN_HVC
 port 2 nsew power bidirectional
-flabel metal2 s 9499 8993 14279 9141 2 FreeSans 2000 90 0 0 SRC_BDY_HVC
+flabel metal2 s 9499 -407 14279 -259 2 FreeSans 2000 90 0 0 SRC_BDY_HVC
 port 5 nsew ground bidirectional
-flabel metal3 s 16978 8993 19178 9311 0 FreeSans 2000 0 0 0 DRN_HVC
+flabel metal3 s 16978 -407 19178 -89 0 FreeSans 2000 0 0 0 DRN_HVC
 port 2 nsew power bidirectional
-flabel metal3 s 14579 8993 16779 9141 2 FreeSans 2000 90 0 0 SRC_BDY_HVC
+flabel metal3 s 14579 -407 16779 -259 2 FreeSans 2000 90 0 0 SRC_BDY_HVC
 port 5 nsew ground bidirectional
-flabel metal3 s 0 8993 14279 9384 0 FreeSans 2000 0 0 0 P_CORE
+flabel metal3 s 0 -407 14279 -16 0 FreeSans 2000 0 0 0 P_CORE
 port 3 nsew power bidirectional
-flabel metal3 s 19478 8993 33757 9384 0 FreeSans 2000 0 0 0 P_CORE
+flabel metal3 s 19478 -407 33757 -16 0 FreeSans 2000 0 0 0 P_CORE
 port 3 nsew power bidirectional
-flabel metal5 s 16729 36858 16994 38180 0 FreeSans 2000 0 0 0 P_PAD
+flabel metal5 s 16729 27458 16994 28780 0 FreeSans 2000 0 0 0 P_PAD
 port 4 nsew power bidirectional
-flabel metal4 s 33673 47325 33673 47325 3 FreeSans 520 180 0 0 VSSIO
+flabel metal4 s 33673 37925 33673 37925 3 FreeSans 520 180 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 33673 47314 33673 47314 3 FreeSans 520 180 0 0 VSSIO
+flabel metal4 s 33673 37914 33673 37914 3 FreeSans 520 180 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal5 s 33546 18540 33800 20340 3 FreeSans 520 180 0 0 VSSA
+flabel metal5 s 33546 9140 33800 10940 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal5 s 33607 12000 33800 12650 3 FreeSans 520 180 0 0 VDDA
+flabel metal5 s 33607 2600 33800 3250 3 FreeSans 520 180 0 0 VDDA
 port 8 nsew power bidirectional
-flabel metal5 s 33546 17330 33800 18220 3 FreeSans 520 180 0 0 VSSD
+flabel metal5 s 33546 7930 33800 8820 3 FreeSans 520 180 0 0 VSSD
 port 15 nsew ground bidirectional
-flabel metal5 s 33546 20660 33800 21510 3 FreeSans 520 180 0 0 VSSIO_Q
+flabel metal5 s 33546 11260 33800 12110 3 FreeSans 520 180 0 0 VSSIO_Q
 port 16 nsew ground bidirectional
-flabel metal5 s 33546 14180 33800 15070 3 FreeSans 520 180 0 0 VSSIO
+flabel metal5 s 33546 4780 33800 5670 3 FreeSans 520 180 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal5 s 33546 15390 33800 16040 3 FreeSans 520 180 0 0 VSWITCH
+flabel metal5 s 33546 5990 33800 6640 3 FreeSans 520 180 0 0 VSWITCH
 port 9 nsew power bidirectional
-flabel metal5 s 33546 16361 33800 17010 3 FreeSans 520 180 0 0 VSSA
+flabel metal5 s 33546 6961 33800 7610 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal5 s 33546 10790 33800 11680 3 FreeSans 520 180 0 0 VCCD
+flabel metal5 s 33546 1390 33800 2280 3 FreeSans 520 180 0 0 VCCD
 port 13 nsew power bidirectional
-flabel metal5 s 33546 21830 33800 22680 3 FreeSans 520 180 0 0 VDDIO_Q
+flabel metal5 s 33546 12430 33800 13280 3 FreeSans 520 180 0 0 VDDIO_Q
 port 10 nsew power bidirectional
-flabel metal5 s 33546 23000 33800 27990 3 FreeSans 520 180 0 0 VDDIO
+flabel metal5 s 33546 13600 33800 18590 3 FreeSans 520 180 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal5 s 33546 9420 33800 10470 3 FreeSans 520 180 0 0 VCCHIB
+flabel metal5 s 33546 20 33800 1070 3 FreeSans 520 180 0 0 VCCHIB
 port 11 nsew power bidirectional
-flabel metal5 s 33546 12970 33800 13860 3 FreeSans 520 180 0 0 VDDIO
+flabel metal5 s 33546 3570 33800 4460 3 FreeSans 520 180 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal4 s 33546 17310 33800 18240 3 FreeSans 520 180 0 0 VSSD
+flabel metal4 s 33546 7910 33800 8840 3 FreeSans 520 180 0 0 VSSD
 port 15 nsew ground bidirectional
-flabel metal4 s 33607 11980 33800 12670 3 FreeSans 520 180 0 0 VDDA
+flabel metal4 s 33607 2580 33800 3270 3 FreeSans 520 180 0 0 VDDA
 port 8 nsew power bidirectional
-flabel metal4 s 33546 20640 33800 21530 3 FreeSans 520 180 0 0 VSSIO_Q
+flabel metal4 s 33546 11240 33800 12130 3 FreeSans 520 180 0 0 VSSIO_Q
 port 16 nsew ground bidirectional
-flabel metal4 s 33546 14160 33800 15090 3 FreeSans 520 180 0 0 VSSIO
+flabel metal4 s 33546 4760 33800 5690 3 FreeSans 520 180 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 33546 15370 33800 16060 3 FreeSans 520 180 0 0 VSWITCH
+flabel metal4 s 33546 5970 33800 6660 3 FreeSans 520 180 0 0 VSWITCH
 port 9 nsew power bidirectional
-flabel metal4 s 33546 19322 33800 19558 3 FreeSans 520 180 0 0 VSSA
+flabel metal4 s 33546 9922 33800 10158 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 33546 20274 33800 20340 3 FreeSans 520 180 0 0 VSSA
+flabel metal4 s 33546 10874 33800 10940 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 33546 9400 33800 10490 3 FreeSans 520 180 0 0 VCCHIB
+flabel metal4 s 33546 0 33800 1090 3 FreeSans 520 180 0 0 VCCHIB
 port 11 nsew power bidirectional
-flabel metal4 s 33546 12950 33800 13880 3 FreeSans 520 180 0 0 VDDIO
+flabel metal4 s 33546 3550 33800 4480 3 FreeSans 520 180 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal4 s 33546 18540 33800 18606 3 FreeSans 520 180 0 0 VSSA
+flabel metal4 s 33546 9140 33800 9206 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 33546 16340 33800 17030 3 FreeSans 520 180 0 0 VSSA
+flabel metal4 s 33546 6940 33800 7630 3 FreeSans 520 180 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 33546 21810 33800 22700 3 FreeSans 520 180 0 0 VDDIO_Q
+flabel metal4 s 33546 12410 33800 13300 3 FreeSans 520 180 0 0 VDDIO_Q
 port 10 nsew power bidirectional
-flabel metal4 s 33546 10770 33800 11700 3 FreeSans 520 180 0 0 VCCD
+flabel metal4 s 33546 1370 33800 2300 3 FreeSans 520 180 0 0 VCCD
 port 13 nsew power bidirectional
-flabel metal4 s 33546 18666 33800 19262 3 FreeSans 520 180 0 0 AMUXBUS_B
+flabel metal4 s 33546 9266 33800 9862 3 FreeSans 520 180 0 0 AMUXBUS_B
 port 1 nsew signal bidirectional
-flabel metal4 s 33546 44150 33800 48993 3 FreeSans 520 180 0 0 VSSIO
+flabel metal4 s 33546 34750 33800 39593 3 FreeSans 520 180 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 33546 19618 33800 20214 3 FreeSans 520 180 0 0 AMUXBUS_A
+flabel metal4 s 33546 10218 33800 10814 3 FreeSans 520 180 0 0 AMUXBUS_A
 port 0 nsew signal bidirectional
-flabel metal4 s 33546 23000 33800 27993 3 FreeSans 520 180 0 0 VDDIO
+flabel metal4 s 33546 13600 33800 18593 3 FreeSans 520 180 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal4 s 127 47325 127 47325 3 FreeSans 520 0 0 0 VSSIO
+flabel metal4 s 127 37925 127 37925 3 FreeSans 520 0 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 127 47314 127 47314 3 FreeSans 520 0 0 0 VSSIO
+flabel metal4 s 127 37914 127 37914 3 FreeSans 520 0 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal5 s 0 23000 254 27990 3 FreeSans 520 0 0 0 VDDIO
+flabel metal5 s 0 13600 254 18590 3 FreeSans 520 0 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal5 s 0 17330 254 18220 3 FreeSans 520 0 0 0 VSSD
+flabel metal5 s 0 7930 254 8820 3 FreeSans 520 0 0 0 VSSD
 port 15 nsew ground bidirectional
-flabel metal5 s 0 20660 254 21510 3 FreeSans 520 0 0 0 VSSIO_Q
+flabel metal5 s 0 11260 254 12110 3 FreeSans 520 0 0 0 VSSIO_Q
 port 16 nsew ground bidirectional
-flabel metal5 s 0 15390 254 16040 3 FreeSans 520 0 0 0 VSWITCH
+flabel metal5 s 0 5990 254 6640 3 FreeSans 520 0 0 0 VSWITCH
 port 9 nsew power bidirectional
-flabel metal5 s 0 14180 254 15070 3 FreeSans 520 0 0 0 VSSIO
+flabel metal5 s 0 4780 254 5670 3 FreeSans 520 0 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal5 s 0 12000 193 12650 3 FreeSans 520 0 0 0 VDDA
+flabel metal5 s 0 2600 193 3250 3 FreeSans 520 0 0 0 VDDA
 port 8 nsew power bidirectional
-flabel metal5 s 0 12970 254 13860 3 FreeSans 520 0 0 0 VDDIO
+flabel metal5 s 0 3570 254 4460 3 FreeSans 520 0 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal5 s 0 10790 254 11680 3 FreeSans 520 0 0 0 VCCD
+flabel metal5 s 0 1390 254 2280 3 FreeSans 520 0 0 0 VCCD
 port 13 nsew power bidirectional
-flabel metal5 s 0 21830 254 22680 3 FreeSans 520 0 0 0 VDDIO_Q
+flabel metal5 s 0 12430 254 13280 3 FreeSans 520 0 0 0 VDDIO_Q
 port 10 nsew power bidirectional
-flabel metal5 s 0 18540 254 20340 3 FreeSans 520 0 0 0 VSSA
+flabel metal5 s 0 9140 254 10940 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal5 s 0 16361 254 17010 3 FreeSans 520 0 0 0 VSSA
+flabel metal5 s 0 6961 254 7610 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal5 s 0 9420 254 10470 3 FreeSans 520 0 0 0 VCCHIB
+flabel metal5 s 0 20 254 1070 3 FreeSans 520 0 0 0 VCCHIB
 port 11 nsew power bidirectional
-flabel metal4 s 0 44150 254 48993 3 FreeSans 520 0 0 0 VSSIO
+flabel metal4 s 0 34750 254 39593 3 FreeSans 520 0 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 0 12950 254 13880 3 FreeSans 520 0 0 0 VDDIO
+flabel metal4 s 0 3550 254 4480 3 FreeSans 520 0 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal4 s 0 21810 254 22700 3 FreeSans 520 0 0 0 VDDIO_Q
+flabel metal4 s 0 12410 254 13300 3 FreeSans 520 0 0 0 VDDIO_Q
 port 10 nsew power bidirectional
-flabel metal4 s 0 23000 254 27993 3 FreeSans 520 0 0 0 VDDIO
+flabel metal4 s 0 13600 254 18593 3 FreeSans 520 0 0 0 VDDIO
 port 12 nsew power bidirectional
-flabel metal4 s 0 10770 254 11700 3 FreeSans 520 0 0 0 VCCD
+flabel metal4 s 0 1370 254 2300 3 FreeSans 520 0 0 0 VCCD
 port 13 nsew power bidirectional
-flabel metal4 s 0 18540 254 18606 3 FreeSans 520 0 0 0 VSSA
+flabel metal4 s 0 9140 254 9206 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 0 15370 254 16060 3 FreeSans 520 0 0 0 VSWITCH
+flabel metal4 s 0 5970 254 6660 3 FreeSans 520 0 0 0 VSWITCH
 port 9 nsew power bidirectional
-flabel metal4 s 0 9400 254 10490 3 FreeSans 520 0 0 0 VCCHIB
+flabel metal4 s 0 0 254 1090 3 FreeSans 520 0 0 0 VCCHIB
 port 11 nsew power bidirectional
-flabel metal4 s 0 19322 254 19558 3 FreeSans 520 0 0 0 VSSA
+flabel metal4 s 0 9922 254 10158 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 0 20640 254 21530 3 FreeSans 520 0 0 0 VSSIO_Q
+flabel metal4 s 0 11240 254 12130 3 FreeSans 520 0 0 0 VSSIO_Q
 port 16 nsew ground bidirectional
-flabel metal4 s 0 14160 254 15090 3 FreeSans 520 0 0 0 VSSIO
+flabel metal4 s 0 4760 254 5690 3 FreeSans 520 0 0 0 VSSIO
 port 14 nsew ground bidirectional
-flabel metal4 s 0 11980 193 12670 3 FreeSans 520 0 0 0 VDDA
+flabel metal4 s 0 2580 193 3270 3 FreeSans 520 0 0 0 VDDA
 port 8 nsew power bidirectional
-flabel metal4 s 0 19618 254 20214 3 FreeSans 520 0 0 0 AMUXBUS_A
+flabel metal4 s 0 10218 254 10814 3 FreeSans 520 0 0 0 AMUXBUS_A
 port 0 nsew signal bidirectional
-flabel metal4 s 0 20274 254 20340 3 FreeSans 520 0 0 0 VSSA
+flabel metal4 s 0 10874 254 10940 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 0 16340 254 17030 3 FreeSans 520 0 0 0 VSSA
+flabel metal4 s 0 6940 254 7630 3 FreeSans 520 0 0 0 VSSA
 port 7 nsew ground bidirectional
-flabel metal4 s 0 17310 254 18240 3 FreeSans 520 0 0 0 VSSD
+flabel metal4 s 0 7910 254 8840 3 FreeSans 520 0 0 0 VSSD
 port 15 nsew ground bidirectional
-flabel metal4 s 0 18666 254 19262 3 FreeSans 520 0 0 0 AMUXBUS_B
+flabel metal4 s 0 9266 254 9862 3 FreeSans 520 0 0 0 AMUXBUS_B
 port 1 nsew signal bidirectional
 << properties >>
 string LEFclass PAD POWER
-string FIXED_BBOX 0 9400 33800 48993
+string FIXED_BBOX 0 0 33800 39593
 << end >>