Partial update from the reverted commit:  Added the GDS files (which are not being
installed for now), and corrected a command in the Makefile that was under the
wrong recipe.  Changed a message in foundry_install referring to magic 8.2 to
convey the proper meaning of "8.2 or better".  Updated the LEF files for the I/O
pads, which did not get updated along with the SPICE and GDS files, but have been
corrected like the others by separating the pad and core nets of the power
supply pad cells.
diff --git a/VERSION b/VERSION
index 754b84e..82bf676 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.179
+1.0.180
diff --git a/common/foundry_install.py b/common/foundry_install.py
index 42846c3..80e5c64 100755
--- a/common/foundry_install.py
+++ b/common/foundry_install.py
@@ -505,14 +505,15 @@
                 elif int(mag_version_info[0]) == 8:
                     if int(mag_version_info[1]) >= 2:
                         have_mag_8_2 = True
-                        print('Magic version 8.2 available on the system.')
+                        print('Magic version 8.2 (or better) available on the system.')
             except ValueError:
                 print('Error: "magic --version" did not return valid version number.')
     except FileNotFoundError:
         print('Error: Failed to find executable for magic in standard search path.')
 
     if not have_mag_8_2:
-        print('WARNING:  Magic version 8.2 cannot be executed from the standard executable search path.')
+        print('WARNING:  Magic version 8.2 (or beter) cannot be executed ')
+        print('from the standard executable search path.')
         print('Please install or correct the search path.')
         print('Magic database files will not be created, and other missing file formats may not be generated.')
 
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 2e29af7..6fcc1a4 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -166,6 +166,10 @@
 endif
 TECH = sky130
 
+# The run-time environment uses PDKPATH to override the PDK location,
+# so prevent that from happening during PDK install.
+unexport PDKPATH 
+
 # If EF_STYLE is set to 1, then efabless naming conventions are
 # used, otherwise the generic naming conventions are used.
 # Mainly, the hierarchy of library names and file types is reversed
@@ -918,18 +922,18 @@
 	# Remove the base verilog files which have already been included into
 	# the libraries
 	${RM} ${STAGING_PATH}/${SKY130A}/libs.ref/${IO_VERILOG}/*.*.v
-	# Install custom additions to standard cell libraries
-	${STAGE} -source ./custom -target ${STAGING_PATH}/${SKY130A} \
-		-gds %l/gds/*.gds options=custom/scripts/gds_import_setup.tcl \
-		-lef %l/lef/*.lef \
-		-verilog %l/verilog/*.v \
-		-library digital sky130_fd_sc_hd 2>&1 | tee -a ${SKY130A}_make.log
 	# Add a maskhint set for the GPIO pad .mag view to prevent problems writing
 	# when writing HVI to GDS during hierarchical adjustments.
 	${ADDPROP} ${STAGING_PATH}/${SKY130A} sky130_fd_io sky130_fd_io__top_gpiov2 \
 		"MASKHINTS_HVI 1346 17198 5828 19224 13700 1890 15920 2360 24 17522 1778 20612" -mag
 
 digital-a:
+	# Install custom additions to standard cell libraries
+	${STAGE} -source ./custom -target ${STAGING_PATH}/${SKY130A} \
+		-gds %l/gds/*.gds options=custom/scripts/gds_import_setup.tcl \
+		-lef %l/lef/*.lef \
+		-verilog %l/verilog/*.v \
+		-library digital sky130_fd_sc_hd 2>&1 | tee -a ${SKY130A}_make.log
 	# Install all SkyWater digital standard cells.
 	${STAGE} -source ${SKYWATER_LIBS_PATH} -target ${STAGING_PATH}/${SKY130A} \
 		-techlef %l/latest/tech/*.tlef \
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
index 95035f3..4948ee1 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
+        RECT 0.000 68.000 10.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 1.000 92.965 ;
+        RECT 0.000 68.000 10.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,13 +281,11 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 10.000 95.000 ;
-        RECT 0.000 172.000 10.000 197.965 ;
+        RECT 0.000 93.365 10.000 197.965 ;
+        RECT 0.000 66.900 10.000 67.600 ;
         RECT 0.000 61.050 10.000 61.650 ;
         RECT 0.000 55.100 10.000 55.800 ;
-        RECT 0.000 49.710 10.000 50.690 ;
-      LAYER met5 ;
-        RECT 2.600 68.000 7.400 92.950 ;
+        RECT 0.000 49.610 10.000 50.790 ;
   END
 END sky130_ef_io__com_bus_slice_10um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
index 2ab2a77..bd34ce3 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
@@ -169,10 +169,11 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 1.000 95.000 ;
-	RECT 0.000 172.000 1.000 197.965 ;
+        RECT 0.000 93.365 1.000 197.965 ;
+        RECT 0.000 66.900 1.000 67.600 ;
+        RECT 0.000 61.050 1.000 61.650 ;
         RECT 0.000 55.100 1.000 55.800 ;
-        RECT 0.000 49.710 1.000 50.690 ;
+        RECT 0.000 49.610 1.000 50.790 ;
   END
 END sky130_ef_io__com_bus_slice_1um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
index bb10ad7..2d650a0 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
+        RECT 0.000 68.000 20.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 1.000 92.965 ;
+        RECT 0.000 68.000 20.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,13 +281,11 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 20.000 95.000 ;
-        RECT 0.000 172.000 20.000 197.965 ;
+        RECT 0.000 93.365 20.000 197.965 ;
+        RECT 0.000 66.900 20.000 67.600 ;
         RECT 0.000 61.050 20.000 61.650 ;
         RECT 0.000 55.100 20.000 55.800 ;
-        RECT 0.000 49.710 20.000 50.690 ;
-      LAYER met5 ;
-        RECT 2.600 68.000 17.400 92.950 ;
+        RECT 0.000 49.610 20.000 50.790 ;
   END
 END sky130_ef_io__com_bus_slice_20um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
index e0a21f9..46f404e 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
+        RECT 0.000 68.000 5.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 1.000 92.965 ;
+        RECT 0.000 68.000 5.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,11 +281,11 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 5.000 95.000 ;
-        RECT 0.000 172.000 5.000 197.965 ;
+        RECT 0.000 93.365 5.000 197.965 ;
+        RECT 0.000 66.900 5.000 67.600 ;
         RECT 0.000 61.050 5.000 61.650 ;
         RECT 0.000 55.100 5.000 55.800 ;
-        RECT 0.000 49.710 5.000 50.690 ;
+        RECT 0.000 49.610 5.000 50.790 ;
   END
 END sky130_ef_io__com_bus_slice_5um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__gpiov2_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__gpiov2_pad.lef
index 632b7a3..9d6eef6 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__gpiov2_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__gpiov2_pad.lef
@@ -522,26 +522,26 @@
         RECT 78.630 144.655 80.440 166.480 ;
         RECT -0.415 142.845 80.440 144.655 ;
       LAYER pwell ;
-        RECT -0.160 138.780 80.160 142.400 ;
+        RECT -0.290 138.650 80.290 142.530 ;
       LAYER nwell ;
         RECT 46.040 138.345 80.440 138.350 ;
         RECT -0.415 128.630 80.440 138.345 ;
       LAYER pwell ;
-        RECT -0.085 127.150 40.115 128.190 ;
-        RECT 67.040 127.150 80.160 128.190 ;
-        RECT -0.085 123.230 80.160 127.150 ;
-        RECT -0.085 101.385 5.605 123.230 ;
-        RECT 77.995 101.385 80.160 123.230 ;
-        RECT -0.085 100.060 80.160 101.385 ;
-        RECT -0.085 94.090 5.085 100.060 ;
-        RECT 39.515 98.915 80.160 100.060 ;
-        RECT 53.010 97.615 80.160 98.915 ;
-        RECT 76.900 95.820 80.160 97.615 ;
-        RECT 39.515 94.090 80.160 95.820 ;
-        RECT -0.085 94.070 80.160 94.090 ;
-        RECT -0.085 93.095 45.710 94.070 ;
-        RECT -0.085 93.050 46.460 93.095 ;
-        RECT -0.085 91.030 9.170 93.050 ;
+        RECT -0.215 127.280 40.245 128.320 ;
+        RECT 66.910 127.280 80.290 128.320 ;
+        RECT -0.215 123.100 80.290 127.280 ;
+        RECT -0.215 101.515 5.735 123.100 ;
+        RECT 77.865 101.515 80.290 123.100 ;
+        RECT -0.215 99.930 80.290 101.515 ;
+        RECT -0.215 94.220 5.215 99.930 ;
+        RECT 39.385 98.785 80.290 99.930 ;
+        RECT 52.880 97.485 80.290 98.785 ;
+        RECT 76.770 95.950 80.290 97.485 ;
+        RECT 39.385 94.220 80.290 95.950 ;
+        RECT -0.215 93.940 80.290 94.220 ;
+        RECT -0.215 93.225 45.840 93.940 ;
+        RECT -0.215 92.920 46.590 93.225 ;
+        RECT -0.215 90.900 9.300 92.920 ;
       LAYER nwell ;
         RECT 46.940 92.210 80.670 93.130 ;
         RECT 62.650 91.700 80.670 92.210 ;
@@ -576,7 +576,8 @@
         RECT 0.000 -2.035 61.490 1.465 ;
         RECT 64.030 -0.145 65.390 2.135 ;
       LAYER pwell ;
-        RECT 64.375 -1.785 66.075 -1.035 ;
+        RECT 64.245 -1.915 66.205 -0.905 ;
+        RECT 66.610 -1.915 68.210 -0.655 ;
       LAYER li1 ;
         RECT 0.000 176.610 80.000 197.670 ;
         RECT -0.085 168.055 80.105 176.610 ;
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 7106209..052a698 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
@@ -373,7 +373,6 @@
         RECT 72.895 44.965 74.895 46.885 ;
       LAYER met3 ;
         RECT 0.000 61.050 169.000 244.965 ;
-        RECT 0.000 60.650 21.535 61.050 ;
         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 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_hvc_pad.lef
index 9390503..d1891cc 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_hvc_pad.lef
@@ -55,6 +55,14 @@
         RECT 25.895 -2.035 36.895 0.690 ;
     END
   END SRC_BDY_HVC
+  PIN VCCD_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VCCD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -227,10 +235,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.390 -2.035 74.290 6.865 ;
     END
@@ -333,7 +337,7 @@
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 3.625 -0.970 11.155 21.885 ;
+        RECT 3.495 -1.100 11.285 21.755 ;
       LAYER nwell ;
         RECT 11.860 -1.350 70.965 0.170 ;
       LAYER li1 ;
@@ -390,10 +394,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
+        RECT 0.000 165.510 75.000 197.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped2_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped2_pad.lef
index 75f7e1e..3389c74 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped2_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped2_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VCCD_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VCCD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -203,10 +211,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 10.270 99.865 64.670 167.130 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 6.865 ;
     END
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped_pad.lef
index c4ed701..11eb9a0 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_clamped_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VCCD_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VCCD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -203,10 +211,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 10.270 99.865 64.670 167.130 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 6.865 ;
     END
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_pad.lef
index f0ebf89..880a340 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vccd_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VCCD_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VCCD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -243,10 +251,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 6.865 ;
     END
@@ -404,10 +408,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_clamped_pad.lef
index ec71652..89c4210 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_clamped_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VDDA_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VDDA_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -87,10 +95,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 7.050 103.085 67.890 163.910 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.390 -2.035 74.290 12.925 ;
     END
@@ -317,7 +321,7 @@
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 3.625 -0.970 11.155 21.885 ;
+        RECT 3.495 -1.100 11.285 21.755 ;
       LAYER nwell ;
         RECT 11.860 -1.350 70.965 0.170 ;
       LAYER li1 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_pad.lef
index 4559651..7819a12 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_hvc_pad.lef
@@ -12,7 +12,7 @@
     USE SIGNAL ;
     PORT
       LAYER met4 ;
-        RECT 0.000 51.090 75.000 54.070 ;
+        RECT 73.730 51.090 75.000 54.070 ;
     END
     PORT
       LAYER met4 ;
@@ -24,7 +24,7 @@
     USE SIGNAL ;
     PORT
       LAYER met4 ;
-        RECT 0.000 46.330 75.000 49.310 ;
+        RECT 0.000 46.330 75.000 49.610 ;
     END
     PORT
       LAYER met4 ;
@@ -55,6 +55,14 @@
         RECT 25.895 -2.035 36.895 0.690 ;
     END
   END SRC_BDY_HVC
+  PIN VDDA_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VDDA_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -80,11 +88,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 54.370 75.000 54.700 ;
+        RECT 0.000 54.070 75.000 56.070 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 45.700 75.000 46.030 ;
+        RECT 73.730 45.700 75.000 46.030 ;
     END
     PORT
       LAYER met4 ;
@@ -111,16 +119,12 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
+      LAYER met3 ;
+        RECT 50.390 -2.035 74.290 14.925 ;
     END
     PORT
       LAYER met3 ;
-        RECT 50.390 -2.035 74.290 12.925 ;
-    END
-    PORT
-      LAYER met3 ;
-        RECT 0.495 -2.035 24.395 12.925 ;
+        RECT 0.495 -2.035 24.395 14.925 ;
     END
     PORT
       LAYER met5 ;
@@ -260,11 +264,11 @@
     USE GROUND ;
     PORT
       LAYER met4 ;
-        RECT 74.225 173.750 75.000 197.965 ;
+        RECT 74.225 173.750 75.000 199.965 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 173.750 1.205 197.965 ;
+        RECT 0.000 173.750 1.205 199.965 ;
     END
     PORT
       LAYER met4 ;
@@ -341,7 +345,7 @@
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 3.625 -0.970 11.155 21.885 ;
+        RECT 3.495 -1.100 11.285 21.755 ;
       LAYER nwell ;
         RECT 11.860 -1.350 70.965 0.170 ;
       LAYER li1 ;
@@ -364,48 +368,106 @@
         RECT 24.675 0.000 50.110 0.300 ;
         RECT 25.895 -2.035 27.895 -0.115 ;
       LAYER met3 ;
-        RECT 0.240 13.325 74.655 197.965 ;
-        RECT 24.795 9.695 49.990 13.325 ;
+        RECT 0.240 15.325 74.290 197.965 ;
+        RECT 24.795 9.695 49.990 15.325 ;
         RECT 24.795 1.090 37.490 9.695 ;
         RECT 24.795 0.690 25.495 1.090 ;
         RECT 37.295 0.690 37.490 1.090 ;
         RECT 49.290 0.690 49.990 9.695 ;
       LAYER met4 ;
+        RECT 1.205 197.965 74.225 199.965 ;
         RECT 1.670 173.350 73.330 197.965 ;
-        RECT 0.965 93.365 74.035 173.350 ;
-        RECT 1.670 67.600 73.330 93.365 ;
-        RECT 0.965 66.900 74.035 67.600 ;
-        RECT 1.670 61.650 73.330 66.900 ;
-        RECT 0.965 61.050 74.035 61.650 ;
-        RECT 1.670 55.800 73.330 61.050 ;
-        RECT 0.965 55.100 74.035 55.800 ;
-        RECT 1.670 49.710 73.330 50.690 ;
-        RECT 0.965 44.600 74.035 45.300 ;
-        RECT 1.670 39.150 73.330 44.600 ;
-        RECT 0.965 38.550 74.035 39.150 ;
-        RECT 1.670 34.300 73.330 38.550 ;
-        RECT 0.965 33.700 74.035 34.300 ;
-        RECT 1.670 29.450 73.330 33.700 ;
-        RECT 0.965 28.850 74.035 29.450 ;
-        RECT 1.670 23.400 73.330 28.850 ;
-        RECT 0.965 22.800 74.035 23.400 ;
-        RECT 1.670 17.350 73.330 22.800 ;
-        RECT 0.965 16.750 74.035 17.350 ;
-        RECT 1.365 12.500 73.635 16.750 ;
-        RECT 0.965 11.900 74.035 12.500 ;
-        RECT 1.670 6.450 73.330 11.900 ;
-        RECT 0.965 5.850 74.035 6.450 ;
-        RECT 1.670 0.000 73.330 5.850 ;
+        RECT 0.000 93.145 75.000 173.350 ;
+        RECT 0.000 92.965 0.715 93.145 ;
+        RECT 0.000 67.600 0.715 68.000 ;
+        RECT 1.670 67.600 73.330 93.145 ;
+        RECT 0.000 66.500 75.000 67.600 ;
+        RECT 0.000 61.650 0.715 62.050 ;
+        RECT 1.670 61.650 73.330 66.500 ;
+        RECT 0.000 60.650 75.000 61.650 ;
+        RECT 1.670 56.470 73.330 60.650 ;
+        RECT 1.670 51.090 73.330 53.670 ;
+        RECT 0.000 50.790 75.000 51.090 ;
+        RECT 1.670 50.010 73.330 50.790 ;
+        RECT 0.000 46.030 75.000 46.200 ;
+        RECT 0.000 45.300 0.715 45.700 ;
+        RECT 1.670 45.300 73.330 45.930 ;
+        RECT 0.000 44.200 75.000 45.300 ;
+        RECT 0.000 39.150 0.715 39.550 ;
+        RECT 1.670 39.150 73.330 44.200 ;
+        RECT 0.000 38.150 75.000 39.150 ;
+        RECT 0.000 34.300 0.715 34.700 ;
+        RECT 1.670 34.300 73.330 38.150 ;
+        RECT 0.000 33.300 75.000 34.300 ;
+        RECT 0.000 29.450 0.715 29.850 ;
+        RECT 1.670 29.450 73.330 33.300 ;
+        RECT 0.000 28.450 75.000 29.450 ;
+        RECT 0.000 23.400 0.715 23.800 ;
+        RECT 1.670 23.400 73.330 28.450 ;
+        RECT 0.000 22.400 75.000 23.400 ;
+        RECT 0.000 17.565 0.525 17.750 ;
+        RECT 0.000 17.445 0.715 17.565 ;
+        RECT 0.000 17.350 0.525 17.445 ;
+        RECT 1.670 17.350 73.330 22.400 ;
+        RECT 0.000 16.750 75.000 17.350 ;
+        RECT 0.000 16.685 0.525 16.750 ;
+        RECT 1.365 16.685 73.635 16.750 ;
+        RECT 0.000 16.565 75.000 16.685 ;
+        RECT 0.000 16.350 0.525 16.565 ;
+        RECT 0.000 12.500 0.715 12.900 ;
+        RECT 1.365 12.500 73.635 16.565 ;
+        RECT 0.000 11.500 75.000 12.500 ;
+        RECT 0.000 6.450 0.715 6.850 ;
+        RECT 1.670 6.450 73.330 11.500 ;
+        RECT 0.000 5.450 75.000 6.450 ;
+        RECT 1.670 0.000 73.330 5.450 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
-        RECT 2.870 34.805 72.130 94.550 ;
-        RECT 0.000 34.800 75.000 34.805 ;
-        RECT 2.870 16.250 72.130 34.800 ;
+        RECT 0.000 165.510 75.000 199.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
+        RECT 0.000 93.645 0.715 94.550 ;
+        RECT 2.870 93.645 72.130 94.550 ;
+        RECT 0.000 93.145 75.000 93.645 ;
+        RECT 0.000 92.950 0.715 93.145 ;
+        RECT 0.000 67.100 0.715 68.000 ;
+        RECT 2.870 67.100 72.130 93.145 ;
+        RECT 0.000 66.400 75.000 67.100 ;
+        RECT 0.000 61.250 0.715 62.150 ;
+        RECT 2.870 61.250 72.130 66.400 ;
+        RECT 0.000 60.550 75.000 61.250 ;
+        RECT 2.870 56.300 72.130 60.550 ;
+        RECT 0.000 54.700 75.000 56.300 ;
+        RECT 0.000 44.800 0.715 45.700 ;
+        RECT 2.870 44.800 72.130 54.700 ;
+        RECT 0.000 44.100 75.000 44.800 ;
+        RECT 0.000 38.750 0.715 39.650 ;
+        RECT 2.870 38.750 72.130 44.100 ;
+        RECT 0.000 38.100 75.000 38.750 ;
+        RECT 0.000 38.050 0.715 38.100 ;
+        RECT 0.000 33.900 0.715 34.805 ;
+        RECT 2.870 33.900 72.130 38.100 ;
+        RECT 0.000 33.250 75.000 33.900 ;
+        RECT 0.000 33.200 0.715 33.250 ;
+        RECT 0.000 29.050 0.715 29.950 ;
+        RECT 2.870 29.050 72.130 33.250 ;
+        RECT 0.000 28.350 75.000 29.050 ;
+        RECT 0.000 23.000 0.715 23.900 ;
+        RECT 2.870 23.000 72.130 28.350 ;
+        RECT 0.000 22.300 75.000 23.000 ;
+        RECT 0.000 16.950 0.715 17.850 ;
+        RECT 2.870 16.950 72.130 22.300 ;
+        RECT 0.000 16.300 75.000 16.950 ;
+        RECT 0.000 16.250 0.715 16.300 ;
+        RECT 2.870 16.250 72.130 16.300 ;
         RECT 2.565 13.000 72.435 16.250 ;
-        RECT 2.870 0.100 72.130 13.000 ;
+        RECT 0.000 12.100 0.715 13.000 ;
+        RECT 2.870 12.100 72.130 13.000 ;
+        RECT 0.000 11.400 75.000 12.100 ;
+        RECT 0.000 6.045 0.715 6.950 ;
+        RECT 2.870 6.045 72.130 11.400 ;
+        RECT 0.000 5.350 75.000 6.045 ;
+        RECT 2.870 0.100 72.130 5.350 ;
   END
 END sky130_ef_io__vdda_hvc_pad
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_lvc_pad.lef
index f3a3146..90e21f0 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vdda_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VDDA_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VDDA_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -150,10 +158,6 @@
       LAYER met4 ;
         RECT 0.000 12.900 0.965 16.350 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
   END VDDA
   PIN VSWITCH
     DIRECTION INOUT ;
@@ -396,10 +400,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_clamped_pad.lef
index 72de30b..56d4608 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_clamped_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VDDIO_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VDDIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -167,10 +175,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 7.050 103.085 67.890 163.910 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.390 -2.035 74.290 17.765 ;
     END
@@ -309,7 +313,7 @@
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 3.625 -0.970 11.155 21.885 ;
+        RECT 3.495 -1.100 11.285 21.755 ;
       LAYER nwell ;
         RECT 11.860 -1.350 70.965 0.170 ;
       LAYER li1 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_pad.lef
index d316d21..7bcde18 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_hvc_pad.lef
@@ -55,6 +55,14 @@
         RECT 25.895 -2.035 36.895 0.690 ;
     END
   END SRC_BDY_HVC
+  PIN VDDIO_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VDDIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -191,10 +199,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.390 -2.035 74.290 17.765 ;
     END
@@ -333,7 +337,7 @@
   END VSSIO_Q
   OBS
       LAYER pwell ;
-        RECT 3.625 -0.970 11.155 21.885 ;
+        RECT 3.495 -1.100 11.285 21.755 ;
       LAYER nwell ;
         RECT 11.860 -1.350 70.965 0.170 ;
       LAYER li1 ;
@@ -389,10 +393,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
+        RECT 0.000 165.510 75.000 197.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_lvc_pad.lef
index 9feb1fa..5cd2613 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vddio_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VDDIO_PAD
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VDDIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -207,10 +215,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 17.765 ;
     END
@@ -396,10 +400,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_clamped_pad.lef
index 3f61fbe..dbd3116 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_clamped_pad.lef
@@ -31,13 +31,17 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
-  PIN VSSA
+  PIN VSSA_PAD
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
       LAYER met5 ;
         RECT 7.050 103.085 67.890 163.910 ;
     END
+  END VSSA_PAD
+  PIN VSSA
+    DIRECTION INOUT ;
+    USE GROUND ;
     PORT
       LAYER met3 ;
         RECT 0.495 -2.035 24.395 30.480 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_pad.lef
index e3b0a9f..26e8ea7 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_hvc_pad.lef
@@ -55,13 +55,17 @@
         RECT 25.895 -2.035 36.895 10.390 ;
     END
   END SRC_BDY_HVC
-  PIN VSSA
+  PIN VSSA_PAD
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
       LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
+        RECT 7.050 103.085 67.890 163.910 ;
     END
+  END VSSA_PAD
+  PIN VSSA
+    DIRECTION INOUT ;
+    USE GROUND ;
     PORT
       LAYER met3 ;
         RECT 0.495 -2.035 24.395 30.480 ;
@@ -392,10 +396,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
+        RECT 0.000 165.510 75.000 197.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_lvc_pad.lef
index caa60e8..7bea8e4 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssa_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VSSA_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VSSA_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -130,10 +138,6 @@
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 34.725 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
   END VSSA
   PIN VDDA
     DIRECTION INOUT ;
@@ -395,10 +399,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_hvc_pad.lef
index b5ca42f..0c14633 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_hvc_pad.lef
@@ -55,6 +55,14 @@
         RECT 25.895 -2.035 36.895 10.390 ;
     END
   END SRC_BDY_HVC
+  PIN VSSD_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VSSD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -283,10 +291,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 0.495 -2.035 24.395 30.480 ;
     END
@@ -386,10 +390,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
+        RECT 0.000 165.510 75.000 197.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped2_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped2_pad.lef
index 5502c2f..7b0ac22 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped2_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped2_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VSSD_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VSSD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -259,10 +267,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 10.270 99.865 64.670 167.130 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 39.565 ;
     END
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped_pad.lef
index 3dd6924..56f3272 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_clamped_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VSSD_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VSSD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -259,10 +267,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 10.270 99.865 64.670 167.130 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 39.565 ;
     END
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_pad.lef
index 5d88f78..1ca3614 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssd_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VSSD_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VSSD_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -299,10 +307,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 39.565 ;
     END
@@ -403,10 +407,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_clamped_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_clamped_pad.lef
index b94d488..1e1eab8 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_clamped_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_clamped_pad.lef
@@ -31,6 +31,14 @@
         RECT 0.000 46.330 1.270 49.310 ;
     END
   END AMUXBUS_B
+  PIN VSSIO_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VSSIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -223,10 +231,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 7.050 103.085 67.890 163.910 ;
-    END
-    PORT
       LAYER met4 ;
         RECT 0.630 189.565 0.640 189.575 ;
     END
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_pad.lef
index 0ce4763..b53ab6a 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_hvc_pad.lef
@@ -55,6 +55,14 @@
         RECT 25.895 -2.035 36.895 10.390 ;
     END
   END SRC_BDY_HVC
+  PIN VSSIO_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 7.050 103.085 67.890 163.910 ;
+    END
+  END VSSIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -247,10 +255,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 6.100 101.975 68.800 164.590 ;
-    END
-    PORT
       LAYER met4 ;
         RECT 0.630 189.565 0.640 189.575 ;
     END
@@ -385,10 +389,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 166.190 75.000 197.965 ;
-        RECT 0.000 100.375 4.500 166.190 ;
-        RECT 70.400 100.375 75.000 166.190 ;
-        RECT 0.000 94.550 75.000 100.375 ;
+        RECT 0.000 165.510 75.000 197.965 ;
+        RECT 0.000 101.485 5.450 165.510 ;
+        RECT 69.490 101.485 75.000 165.510 ;
+        RECT 0.000 94.550 75.000 101.485 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_lvc_pad.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_lvc_pad.lef
index eaf4fd1..addab2e 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_lvc_pad.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__vssio_lvc_pad.lef
@@ -71,6 +71,14 @@
         RECT 34.440 -0.035 44.440 0.290 ;
     END
   END BDY2_B2B
+  PIN VSSIO_PAD
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met5 ;
+        RECT 10.270 99.865 64.670 167.130 ;
+    END
+  END VSSIO_PAD
   PIN VSSA
     DIRECTION INOUT ;
     USE GROUND ;
@@ -263,10 +271,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER met5 ;
-        RECT 9.315 100.105 65.955 167.535 ;
-    END
-    PORT
       LAYER met3 ;
         RECT 50.755 -0.035 74.700 23.815 ;
     END
@@ -395,10 +399,10 @@
         RECT 0.965 5.850 74.035 6.450 ;
         RECT 1.670 0.000 73.330 5.850 ;
       LAYER met5 ;
-        RECT 0.000 169.135 75.000 197.965 ;
-        RECT 0.000 98.505 7.715 169.135 ;
-        RECT 67.555 98.505 75.000 169.135 ;
-        RECT 0.000 94.550 75.000 98.505 ;
+        RECT 0.000 168.730 75.000 197.965 ;
+        RECT 0.000 98.265 8.670 168.730 ;
+        RECT 66.270 98.265 75.000 168.730 ;
+        RECT 0.000 94.550 75.000 98.265 ;
         RECT 2.870 34.805 72.130 94.550 ;
         RECT 0.000 34.800 75.000 34.805 ;
         RECT 2.870 16.250 72.130 34.800 ;
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..ac69456
--- /dev/null
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
@@ -0,0 +1,693 @@
+MACRO sky130_fd_io__top_gpio_ovtv2
+  CLASS PAD ;
+  FOREIGN sky130_fd_io__top_gpio_ovtv2 ;
+  ORIGIN 0.000 0.000 ;
+  SIZE 140.000 BY 200.000 ;
+  SYMMETRY X Y R90 ;
+  PIN VSSIO_Q
+    DIRECTION INOUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE POWER ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met5 ;
+        RECT 17.930 117.530 86.325 162.905 ;
+    END
+  END PAD
+  PIN AMUXBUS_A
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 129.125 0.000 129.455 20.955 ;
+    END
+  END DM[0]
+  PIN DM[1]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 128.275 0.000 128.605 20.180 ;
+    END
+  END DM[1]
+  PIN DM[2]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 108.395 0.000 108.725 20.640 ;
+    END
+  END DM[2]
+  PIN INP_DIS
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 107.545 0.000 107.875 8.060 ;
+    END
+  END INP_DIS
+  PIN VTRIP_SEL
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 87.665 0.000 87.995 20.980 ;
+    END
+  END VTRIP_SEL
+  PIN IB_MODE_SEL[0]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 86.815 0.000 87.145 20.980 ;
+    END
+  END IB_MODE_SEL[0]
+  PIN IB_MODE_SEL[1]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 66.935 0.000 67.265 20.980 ;
+    END
+  END IB_MODE_SEL[1]
+  PIN SLEW_CTL[0]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 66.085 0.000 66.415 20.980 ;
+    END
+  END SLEW_CTL[0]
+  PIN SLEW_CTL[1]
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 46.205 0.000 46.535 20.980 ;
+    END
+  END SLEW_CTL[1]
+  PIN HYS_TRIM
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 45.355 0.000 45.685 8.060 ;
+    END
+  END HYS_TRIM
+  PIN HLD_OVR
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 27.355 0.000 27.685 14.055 ;
+    END
+  END HLD_OVR
+  PIN ENABLE_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 22.135 0.000 22.465 30.150 ;
+    END
+  END ENABLE_H
+  PIN HLD_H_N
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 19.635 0.000 19.965 17.985 ;
+    END
+  END HLD_H_N
+  PIN ENABLE_VDDA_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 8.770 0.000 9.100 7.915 ;
+    END
+  END ENABLE_VDDA_H
+  PIN ANALOG_EN
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 8.115 0.000 8.445 14.070 ;
+    END
+  END ANALOG_EN
+  PIN ENABLE_INP_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 7.110 0.000 7.440 0.670 ;
+    END
+  END ENABLE_INP_H
+  PIN IN
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 20.380 0.000 20.710 11.310 ;
+    END
+  END IN
+  PIN IN_H
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 24.380 0.000 24.710 0.940 ;
+    END
+  END IN_H
+  PIN VINREF
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 44.035 0.000 44.365 4.885 ;
+    END
+  END VINREF
+  PIN OUT
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 74.125 0.000 74.455 14.865 ;
+    END
+  END OUT
+  PIN ANALOG_POL
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 65.235 0.000 65.565 1.165 ;
+    END
+  END ANALOG_POL
+  PIN ANALOG_SEL
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 51.655 0.000 51.985 8.060 ;
+    END
+  END ANALOG_SEL
+  PIN SLOW
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 125.140 0.000 125.470 11.965 ;
+    END
+  END SLOW
+  PIN OE_N
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 124.445 0.000 124.775 8.060 ;
+    END
+  END OE_N
+  PIN TIE_HI_ESD
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 129.975 0.000 130.305 61.655 ;
+    END
+  END TIE_HI_ESD
+  PIN TIE_LO_ESD
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 115.290 0.000 115.890 39.035 ;
+    END
+  END TIE_LO_ESD
+  PIN PAD_A_ESD_0_H
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 0.330 0.000 0.930 71.380 ;
+    END
+  END PAD_A_ESD_1_H
+  PIN PAD_A_NOESD_H
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 2.885 0.000 3.485 5.900 ;
+    END
+  END PAD_A_NOESD_H
+  PIN ENABLE_VSWITCH_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 5.765 0.000 6.365 12.470 ;
+    END
+  END ENABLE_VSWITCH_H
+  PIN ENABLE_VDDIO
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT 95.845 0.000 96.215 20.755 ;
+    END
+  END ENABLE_VDDIO
+  OBS
+      LAYER nwell ;
+        RECT 118.950 184.430 140.420 185.605 ;
+        RECT 130.895 183.580 140.420 184.430 ;
+        RECT 133.940 180.105 140.420 183.580 ;
+        RECT 133.900 174.850 140.420 180.105 ;
+        RECT 133.175 161.940 140.420 174.850 ;
+        RECT 133.740 128.090 140.420 161.940 ;
+        RECT 132.500 122.180 140.420 128.090 ;
+        RECT 118.950 117.425 140.420 122.180 ;
+      LAYER pwell ;
+        RECT 114.115 114.365 140.130 116.895 ;
+        RECT 131.245 110.270 140.130 114.365 ;
+      LAYER nwell ;
+        RECT 6.155 107.630 141.055 109.740 ;
+        RECT 138.945 67.930 141.055 107.630 ;
+        RECT 6.155 66.420 141.055 67.930 ;
+        RECT 132.725 63.655 140.680 65.015 ;
+        RECT 139.320 54.255 140.680 63.655 ;
+        RECT 132.725 52.895 140.680 54.255 ;
+      LAYER pwell ;
+        RECT 11.470 18.640 140.130 20.430 ;
+        RECT 32.115 17.020 140.130 18.640 ;
+      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 184.675 140.000 199.780 ;
+        RECT 0.230 117.690 140.085 184.675 ;
+        RECT 0.230 116.765 140.000 117.690 ;
+        RECT 0.230 110.400 140.145 116.765 ;
+        RECT 0.230 109.110 140.000 110.400 ;
+        RECT 0.230 67.170 140.475 109.110 ;
+        RECT 0.230 66.750 140.425 67.170 ;
+        RECT 0.230 64.685 140.000 66.750 ;
+        RECT 0.230 53.225 140.350 64.685 ;
+        RECT 0.230 0.200 140.000 53.225 ;
+      LAYER met1 ;
+        RECT 0.080 184.720 140.000 199.810 ;
+        RECT 0.080 183.205 140.145 184.720 ;
+        RECT 0.080 117.630 140.115 183.205 ;
+        POLYGON 140.115 183.205 140.145 183.205 140.115 183.175 ;
+        RECT 0.080 108.870 140.000 117.630 ;
+        RECT 0.080 67.170 140.475 108.870 ;
+        RECT 0.080 64.685 140.000 67.170 ;
+        RECT 0.080 53.225 140.350 64.685 ;
+        RECT 0.080 0.000 140.000 53.225 ;
+      LAYER met2 ;
+        RECT 0.080 184.720 140.000 199.955 ;
+        RECT 0.080 182.890 140.130 184.720 ;
+        RECT 0.080 68.140 140.000 182.890 ;
+        RECT 0.080 63.715 140.325 68.140 ;
+        RECT 0.080 0.000 140.000 63.715 ;
+      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..7f9a73d
--- /dev/null
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
@@ -0,0 +1,1687 @@
+MACRO sky130_fd_io__top_xres4v2
+  CLASS PAD ;
+  FOREIGN sky130_fd_io__top_xres4v2 ;
+  ORIGIN 0.000 0.000 ;
+  SIZE 75.000 BY 200.000 ;
+  SYMMETRY R90 ;
+  PIN PAD_A_ESD_H
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    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
+    PORT
+      LAYER met3 ;
+        RECT 28.170 10.610 28.900 13.980 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.170 10.610 29.050 10.760 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.170 10.910 28.900 14.770 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.170 10.145 28.635 10.610 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.335 10.445 29.215 10.595 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.635 9.845 29.665 10.445 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.900 10.145 29.665 10.910 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.935 0.000 29.665 9.845 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 28.935 4.005 29.665 10.145 ;
+    END
+  END XRES_H_N
+  PIN FILT_IN_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    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
+    PORT
+      LAYER met3 ;
+        RECT 20.075 3.410 21.225 8.135 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.075 6.820 21.375 6.970 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.075 6.970 21.525 7.120 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.075 7.120 21.675 7.150 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.075 7.150 21.060 8.135 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.225 7.150 21.705 7.300 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.375 7.300 21.855 7.450 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.525 7.450 22.005 7.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.675 7.600 22.155 7.750 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 20.825 7.750 22.305 7.900 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.060 8.135 22.970 8.415 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.225 6.670 22.690 8.135 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.340 8.415 24.050 9.980 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.575 8.500 23.055 8.650 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.725 8.650 23.205 8.800 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 21.875 8.800 23.355 8.950 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.025 8.950 23.505 9.100 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.175 9.100 23.655 9.250 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.325 9.250 23.805 9.400 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.570 9.495 24.050 9.645 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.690 8.135 22.970 8.415 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.720 9.645 24.050 9.795 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.905 9.495 24.050 9.980 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.905 9.980 24.050 12.265 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 22.970 8.415 24.050 9.495 ;
+    END
+  END FILT_IN_H
+  PIN ENABLE_VDDIO
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    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
+    PORT
+      LAYER met3 ;
+        RECT 6.775 17.410 7.295 31.880 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 17.410 7.400 17.515 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 17.515 7.295 17.620 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 17.620 7.295 31.295 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 31.400 7.400 31.505 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 31.505 7.150 31.880 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.775 16.895 7.290 17.410 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 6.925 31.505 7.505 31.655 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.150 31.880 8.595 32.595 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.290 16.445 8.330 17.045 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.290 16.895 7.870 17.045 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.295 17.045 7.870 17.620 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.295 31.295 7.880 31.880 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.375 31.955 7.955 32.105 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.440 16.745 8.020 16.895 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.525 32.105 8.105 32.255 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.675 32.255 8.255 32.405 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.740 15.995 8.920 16.445 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.865 32.595 9.180 33.180 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.870 16.585 8.330 17.045 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.880 31.880 8.595 32.595 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 7.890 16.295 8.470 16.445 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.125 32.705 8.705 32.855 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.190 15.785 8.920 15.995 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.275 32.855 8.855 33.005 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.330 15.995 8.920 16.585 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.400 0.000 8.920 15.785 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.400 1.135 8.920 15.995 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.450 33.180 9.395 33.700 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.595 32.595 9.180 33.180 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.815 33.395 22.275 33.545 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 8.970 33.700 21.970 34.125 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 9.115 33.695 22.275 33.845 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 9.180 33.180 9.395 33.395 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 9.395 33.995 22.275 34.125 ;
+    END
+  END ENABLE_VDDIO
+  PIN TIE_WEAK_HI_H
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    PORT
+      LAYER met3 ;
+        RECT 64.860 71.930 65.990 93.540 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 64.860 71.930 66.310 72.080 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 64.860 72.080 66.160 72.230 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 64.860 72.400 65.990 94.645 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 64.860 70.750 66.040 71.930 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 65.140 71.650 66.590 71.800 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 65.290 71.500 66.740 71.650 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 65.440 71.350 66.890 71.500 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 65.590 71.200 67.040 71.350 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 65.990 72.210 66.180 72.400 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.040 69.400 68.355 71.000 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.040 70.750 67.490 70.900 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.180 71.000 67.390 72.210 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.190 70.600 67.640 70.750 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.340 70.450 67.790 70.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.490 70.300 67.940 70.450 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.640 70.150 68.090 70.300 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 66.940 69.850 68.390 70.000 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.090 69.700 68.540 69.850 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.390 68.535 69.305 69.400 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.390 69.400 68.840 69.550 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.390 70.035 68.355 71.000 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.540 69.250 68.990 69.400 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.690 69.100 69.140 69.250 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 67.990 68.800 69.440 68.950 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.255 67.600 70.590 68.535 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.290 68.500 69.740 68.650 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.355 69.085 69.305 70.035 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.440 68.350 69.890 68.500 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.590 68.200 70.040 68.350 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 68.740 68.050 70.190 68.200 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.190 66.200 72.190 67.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.190 67.600 70.640 67.750 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.305 67.800 70.590 69.085 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.340 67.450 70.790 67.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.490 67.300 70.940 67.450 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.640 67.150 71.090 67.300 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.790 67.000 71.240 67.150 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 69.940 66.850 71.390 67.000 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.090 66.700 71.540 66.850 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.240 66.550 71.690 66.700 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.390 66.400 71.840 66.550 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.590 64.600 73.925 66.200 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.590 66.200 72.190 67.800 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.840 65.950 72.290 66.100 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 70.990 65.800 72.440 65.950 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.140 65.650 72.590 65.800 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.290 65.500 72.740 65.650 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.440 65.350 72.890 65.500 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.590 65.200 73.040 65.350 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.740 65.050 73.190 65.200 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 71.890 64.900 73.340 65.050 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 0.000 73.260 49.320 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 0.725 73.260 49.470 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 49.470 73.925 64.025 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 49.620 73.560 49.770 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 49.770 73.710 49.920 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 49.985 73.925 64.465 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 64.465 73.925 64.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 64.465 73.925 66.200 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 64.530 73.795 64.595 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 72.190 64.595 73.790 64.600 ;
+    END
+    PORT
+      LAYER met3 ;
+        RECT 73.260 49.320 73.925 49.985 ;
+    END
+  END TIE_WEAK_HI_H
+  PIN ENABLE_H
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    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
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.250 10.375 4.580 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.965 9.200 10.535 9.400 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.005 3.905 10.350 4.250 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.165 9.400 10.865 9.730 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.210 4.045 10.510 4.115 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.295 9.460 10.595 9.530 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.335 9.200 10.535 9.400 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.350 3.575 10.930 3.930 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.365 9.530 10.665 9.600 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.375 3.930 10.695 4.250 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.420 3.835 10.720 3.905 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.490 3.765 10.790 3.835 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.495 9.730 11.125 10.100 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.535 9.400 10.865 9.730 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.575 9.740 10.875 9.810 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.645 9.810 10.945 9.880 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 26.610 11.125 27.300 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 26.825 11.125 27.085 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 27.085 10.910 28.005 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 27.085 11.055 27.155 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 27.155 10.985 27.225 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 27.295 10.910 27.300 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 27.300 10.910 27.935 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 28.005 11.125 28.625 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 28.075 11.050 28.145 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 28.150 11.125 28.410 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.650 28.410 10.865 28.625 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.655 26.820 11.125 26.825 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.680 3.435 15.245 3.575 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.680 3.575 15.025 3.645 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.695 3.695 10.930 3.930 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.715 9.880 11.015 9.950 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.720 28.410 11.125 28.480 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.725 26.750 11.125 26.820 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.790 28.480 11.125 28.550 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.820 3.435 14.885 3.695 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 10.045 11.125 10.100 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 10.100 11.125 26.610 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 28.150 11.125 31.140 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 28.620 11.125 28.625 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 28.625 11.125 31.085 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 31.140 11.270 31.455 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 31.195 11.125 31.455 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 9.730 11.125 9.990 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.865 9.990 11.125 27.085 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.910 27.085 11.125 27.300 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 10.910 27.935 11.125 28.150 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.005 31.265 11.305 31.335 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.125 31.085 11.270 31.230 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.125 31.455 11.520 31.590 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.260 31.480 11.520 36.020 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.260 31.535 11.520 31.590 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.260 36.020 12.150 36.280 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.270 31.230 11.495 31.455 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 11.495 31.455 11.520 31.480 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 14.775 3.695 15.245 3.795 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 14.875 3.795 15.515 4.065 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 14.885 3.435 15.245 3.795 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 14.985 3.835 15.285 3.905 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.055 3.905 15.355 3.975 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.145 4.065 15.885 4.435 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.245 3.795 15.515 4.065 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.265 4.115 15.565 4.185 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.335 4.185 15.635 4.255 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.405 4.255 15.705 4.325 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.515 4.065 15.885 4.435 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.515 4.435 15.995 4.805 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.615 4.465 15.915 4.535 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.695 4.545 28.765 4.615 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.765 4.615 28.835 4.685 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.885 4.435 15.995 4.545 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 15.885 4.755 28.975 4.805 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.060 4.245 22.660 4.545 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.065 4.540 22.940 4.545 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.135 4.470 22.870 4.540 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.205 4.400 22.800 4.470 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.345 4.260 22.660 4.330 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.350 4.255 22.660 4.260 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.360 0.000 22.660 4.245 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.360 1.170 22.660 4.805 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 22.660 4.260 22.945 4.545 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.655 4.805 29.120 4.900 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.750 4.900 29.450 5.230 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.765 4.545 29.120 4.900 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.865 4.945 29.165 5.015 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 28.935 5.015 29.235 5.085 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.005 5.085 29.305 5.155 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.080 5.230 29.580 5.470 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.120 4.900 29.450 5.230 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.320 10.975 29.770 11.165 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.320 11.085 29.400 11.165 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.320 5.360 29.580 11.030 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.320 5.415 29.580 5.470 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.320 5.470 29.580 10.975 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.400 11.165 30.030 11.535 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.450 5.230 29.580 5.360 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.530 11.225 29.830 11.295 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.580 10.975 29.770 11.165 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.600 11.295 29.900 11.365 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 11.165 30.030 11.425 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 11.425 30.030 15.700 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 11.480 30.030 11.535 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 11.535 30.030 15.645 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 15.700 30.365 15.980 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.770 15.755 29.995 15.980 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.840 15.755 30.140 15.825 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.910 15.825 30.210 15.895 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 29.995 15.980 30.625 16.350 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.030 15.645 30.365 15.980 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.120 16.035 30.420 16.105 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.190 16.105 30.490 16.175 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.365 15.980 30.625 16.240 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.365 16.240 30.625 16.350 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 30.365 16.350 30.625 20.495 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.250 10.005 4.520 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.520 10.050 4.575 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.520 9.995 8.915 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.575 9.995 4.630 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 4.630 9.995 8.860 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 8.915 10.335 9.200 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.735 8.970 9.965 9.200 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.790 4.465 10.105 4.520 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.805 8.970 10.105 9.040 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.860 4.395 10.160 4.465 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.875 9.040 10.175 9.110 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.930 4.325 10.230 4.395 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.965 9.200 10.165 9.400 ;
+    END
+    PORT
+      LAYER met2 ;
+        RECT 9.995 8.860 10.335 9.200 ;
+    END
+  END EN_VDDIO_SIG_H
+  PIN TIE_LO_ESD
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met1 ;
+        RECT 24.905 0.000 25.135 9.975 ;
+    END
+  END INP_SEL_H
+  PIN VSSIO
+    DIRECTION INPUT ;
+    USE GROUND ;
+    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
+    DIRECTION INPUT ;
+    USE GROUND ;
+    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
+    DIRECTION INPUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE POWER ;
+    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
+    DIRECTION INPUT ;
+    USE GROUND ;
+    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
+    DIRECTION INOUT ;
+    USE SIGNAL ;
+    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 73.095 146.690 75.620 168.515 ;
+        RECT -0.515 144.880 75.620 146.690 ;
+      LAYER pwell ;
+        RECT -0.290 140.685 75.290 144.565 ;
+      LAYER nwell ;
+        RECT -0.330 130.665 75.330 140.380 ;
+      LAYER pwell ;
+        RECT -0.130 129.315 41.750 130.355 ;
+        RECT 61.910 129.315 75.130 130.355 ;
+        RECT -0.130 124.135 75.130 129.315 ;
+        RECT -0.130 102.525 1.435 124.135 ;
+        RECT 73.560 102.525 75.130 124.135 ;
+        RECT -0.130 99.230 75.130 102.525 ;
+        RECT -0.130 97.995 58.470 99.230 ;
+        RECT 71.930 97.995 75.130 99.230 ;
+        RECT -0.130 96.735 75.130 97.995 ;
+        RECT -0.130 96.730 58.470 96.735 ;
+      LAYER li1 ;
+        RECT 0.000 144.435 75.000 199.220 ;
+        RECT -0.160 140.815 75.160 144.435 ;
+        RECT 0.000 130.225 75.000 140.815 ;
+        RECT -0.265 101.395 75.000 130.225 ;
+        RECT 0.000 0.185 75.000 101.395 ;
+      LAYER met1 ;
+        RECT 0.000 170.090 75.000 199.210 ;
+        RECT -0.145 131.275 75.145 170.090 ;
+        RECT 0.000 130.220 75.000 131.275 ;
+        RECT -0.145 95.895 75.145 130.220 ;
+        RECT 0.000 10.255 75.000 95.895 ;
+        RECT 0.000 0.610 24.625 10.255 ;
+        RECT 0.000 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.000 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.000 0.610 ;
+      LAYER met2 ;
+        RECT 0.340 36.560 74.915 199.210 ;
+        RECT 0.340 31.870 10.980 36.560 ;
+        RECT 12.430 35.740 74.915 36.560 ;
+        RECT 0.340 31.735 10.845 31.870 ;
+        RECT 0.340 28.905 10.585 31.735 ;
+        RECT 11.800 31.175 74.915 35.740 ;
+        RECT 11.775 30.950 74.915 31.175 ;
+        RECT 11.550 30.805 74.915 30.950 ;
+        RECT 0.340 26.330 10.370 28.905 ;
+        RECT 11.405 27.655 74.915 30.805 ;
+        RECT 11.190 27.580 74.915 27.655 ;
+        RECT 0.340 10.380 10.585 26.330 ;
+        RECT 11.405 20.775 74.915 27.580 ;
+        RECT 11.405 16.630 30.085 20.775 ;
+        RECT 11.405 16.260 29.715 16.630 ;
+        RECT 11.405 11.815 29.490 16.260 ;
+        RECT 30.905 15.700 74.915 20.775 ;
+        RECT 30.645 15.365 74.915 15.700 ;
+        RECT 11.405 11.445 29.120 11.815 ;
+        RECT 0.340 10.010 10.215 10.380 ;
+        RECT 0.340 9.680 9.885 10.010 ;
+        RECT 0.340 9.480 9.685 9.680 ;
+        RECT 0.340 3.970 9.455 9.480 ;
+        RECT 11.405 9.450 29.040 11.445 ;
+        RECT 30.310 10.885 74.915 15.365 ;
+        RECT 30.050 10.695 74.915 10.885 ;
+        RECT 11.145 9.120 29.040 9.450 ;
+        RECT 10.815 8.920 29.040 9.120 ;
+        RECT 10.615 8.580 29.040 8.920 ;
+        RECT 10.275 5.750 29.040 8.580 ;
+        RECT 10.275 5.510 28.800 5.750 ;
+        RECT 10.275 5.180 28.470 5.510 ;
+        RECT 10.275 5.085 28.375 5.180 ;
+        RECT 10.275 4.860 15.235 5.085 ;
+        RECT 29.860 4.950 74.915 10.695 ;
+        RECT 10.655 4.715 15.235 4.860 ;
+        RECT 10.655 4.530 14.865 4.715 ;
+        RECT 29.730 4.620 74.915 4.950 ;
+        RECT 10.975 4.345 14.865 4.530 ;
+        RECT 10.975 4.210 14.595 4.345 ;
+        RECT 29.400 4.265 74.915 4.620 ;
+        RECT 11.210 4.075 14.595 4.210 ;
+        RECT 16.275 4.155 21.780 4.265 ;
+        RECT 11.210 3.975 14.495 4.075 ;
+        RECT 0.340 3.625 9.725 3.970 ;
+        RECT 16.165 3.965 21.780 4.155 ;
+        RECT 23.225 3.980 74.915 4.265 ;
+        RECT 16.165 3.785 22.080 3.965 ;
+        RECT 0.340 3.295 10.070 3.625 ;
+        RECT 15.795 3.515 22.080 3.785 ;
+        RECT 0.340 3.155 10.400 3.295 ;
+        RECT 15.525 3.155 22.080 3.515 ;
+        RECT 0.340 1.690 22.080 3.155 ;
+        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.000 22.080 1.690 ;
+        RECT 22.940 0.610 74.915 3.980 ;
+        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 95.045 74.700 200.000 ;
+        RECT 0.965 70.350 64.460 95.045 ;
+        RECT 66.390 72.800 74.700 95.045 ;
+        RECT 66.580 72.610 74.700 72.800 ;
+        RECT 67.790 71.400 74.700 72.610 ;
+        RECT 68.755 70.435 74.700 71.400 ;
+        RECT 0.965 69.000 65.640 70.350 ;
+        RECT 69.705 69.485 74.700 70.435 ;
+        RECT 0.965 68.135 66.990 69.000 ;
+        RECT 70.990 68.200 74.700 69.485 ;
+        RECT 0.965 67.200 67.855 68.135 ;
+        RECT 0.965 65.800 68.790 67.200 ;
+        RECT 72.590 66.600 74.700 68.200 ;
+        RECT 0.965 64.200 70.190 65.800 ;
+        RECT 0.965 34.525 71.790 64.200 ;
+        RECT 74.325 48.920 74.700 66.600 ;
+        RECT 0.965 34.100 8.570 34.525 ;
+        RECT 0.965 33.580 8.050 34.100 ;
+        RECT 0.965 32.995 7.465 33.580 ;
+        RECT 22.675 32.995 71.790 34.525 ;
+        RECT 0.965 32.280 6.750 32.995 ;
+        RECT 9.795 32.780 71.790 32.995 ;
+        RECT 0.965 16.495 6.375 32.280 ;
+        RECT 9.580 32.195 71.790 32.780 ;
+        RECT 8.995 31.480 71.790 32.195 ;
+        RECT 8.280 30.895 71.790 31.480 ;
+        RECT 7.695 18.020 71.790 30.895 ;
+        RECT 8.270 17.445 71.790 18.020 ;
+        RECT 8.730 16.985 71.790 17.445 ;
+        RECT 0.965 16.045 6.890 16.495 ;
+        RECT 0.965 15.595 7.340 16.045 ;
+        RECT 0.965 15.385 7.790 15.595 ;
+        RECT 0.965 0.565 8.000 15.385 ;
+        RECT 9.320 15.170 71.790 16.985 ;
+        RECT 9.320 12.665 27.770 15.170 ;
+        RECT 9.320 10.380 22.505 12.665 ;
+        RECT 9.320 8.815 20.940 10.380 ;
+        RECT 24.450 9.745 27.770 12.665 ;
+        RECT 29.300 11.310 71.790 15.170 ;
+        RECT 24.450 9.445 28.235 9.745 ;
+        RECT 9.320 8.535 20.660 8.815 ;
+        RECT 9.320 3.010 19.675 8.535 ;
+        RECT 24.450 8.015 28.535 9.445 ;
+        RECT 23.370 7.735 28.535 8.015 ;
+        RECT 23.090 6.270 28.535 7.735 ;
+        RECT 21.625 3.010 28.535 6.270 ;
+        RECT 9.320 1.810 28.535 3.010 ;
+        RECT 9.320 0.965 19.675 1.810 ;
+        RECT 9.320 0.565 16.845 0.965 ;
+        RECT 19.310 0.565 19.675 0.965 ;
+        RECT 21.625 0.565 28.535 1.810 ;
+        RECT 30.065 0.565 71.790 11.310 ;
+        RECT 73.660 0.565 74.700 48.920 ;
+      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_sc_hd/gds/sky130_fd_sc_hd__a2111oi_0.gds b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__a2111oi_0.gds
new file mode 100644
index 0000000..815eca3
--- /dev/null
+++ b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__a2111oi_0.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__buf_16.gds b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__buf_16.gds
new file mode 100644
index 0000000..74c3b8e
--- /dev/null
+++ b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__buf_16.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s15_1.gds b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s15_1.gds
new file mode 100644
index 0000000..b83e145
--- /dev/null
+++ b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s15_1.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s18_1.gds b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s18_1.gds
new file mode 100644
index 0000000..156d3a4
--- /dev/null
+++ b/sky130/custom/sky130_fd_sc_hd/gds/sky130_fd_sc_hd__clkdlybuf4s18_1.gds
Binary files differ