diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
index ae08723..16ba0d9 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
@@ -73,22 +73,6 @@
         RECT 1.515000 1.290000 1.720000 2.465000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 1.975000 -0.065000 2.145000 0.105000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504500 ;
     DIRECTION OUTPUT ;
@@ -108,6 +92,26 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 1.975000 -0.065000 2.145000 0.105000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
index 5ef1929..2209388 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 1.960000 1.325000 2.255000 2.355000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
index eab93aa..3f751c1 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.085000 0.975000 0.370000 1.625000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
index 1f4e99e..d5bd340 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.085000 0.730000 0.435000 1.655000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
index d7bf60c..297c3e2 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
@@ -72,22 +72,6 @@
         RECT 0.785000 1.050000 1.235000 2.455000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 1.975000 -0.065000 2.145000 0.105000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.388750 ;
     DIRECTION OUTPUT ;
@@ -111,6 +95,26 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 1.975000 -0.065000 2.145000 0.105000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
index 471758a..bfd587d 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.755000 1.075000 1.425000 1.275000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.212750 ;
     DIRECTION OUTPUT ;
@@ -115,6 +103,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
index bb78883..f3e5030 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.495000 1.020000 1.845000 1.275000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.009500 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
index 47a55bd..ae13616 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.855000 0.995000 3.125000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.135000 -0.085000 0.305000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.437250 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
index 742a20c..4bd94ad 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.260000 1.045000 3.595000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.452000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
index 9fdc28e..73287e7 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 2.975000 0.985000 3.645000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.933750 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
index f62bcf9..8c258c2 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 1.935000 0.995000 2.235000 1.615000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.619250 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
index 6553f54..54b5ae4 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.100000 0.995000 0.405000 1.615000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.826000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
index 5b888b4..d7b56fa 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
@@ -84,18 +84,6 @@
         RECT 6.130000 1.275000 6.350000 1.695000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.685000 ;
     DIRECTION OUTPUT ;
@@ -125,6 +113,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
index 061b969..e8bee1c 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.105000 0.325000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
index 1ee3ef5..efd8bf5 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.330000 0.995000 1.525000 1.035000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
index da98690..01fa99f 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 0.500000 1.010000 0.830000 1.625000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
index 4f69f96..a2dd7ba 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.470000 1.200000 0.895000 1.955000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.392200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
index e7a789f..9f4c08b 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.105000 0.975000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.551000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
index 17496ae..c4988da 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
@@ -56,18 +56,6 @@
         RECT 0.120000 0.765000 0.425000 1.805000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.627500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
index 34d79bd..b8586a8 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
@@ -55,18 +55,6 @@
         RECT 0.480000 0.995000 0.650000 1.075000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.288000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
index ed5d787..ee3bdfc 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.015000 1.015000 1.480000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
index 421cc4a..aa155fc 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.465000 0.995000 1.790000 1.410000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
index ecc36f5..45f9927 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 2.395000 0.995000 2.705000 1.525000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
index 8cf2b9b..7b59f6b 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.095000 0.675000 0.335000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.447000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
index 42bd08a..01d3656 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
@@ -55,18 +55,6 @@
         RECT 2.800000 0.995000 3.075000 1.625000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.627500 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
index 53b0233..bb18849 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
@@ -55,18 +55,6 @@
         RECT 0.090000 1.035000 1.430000 1.415000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.288000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
index 0f651b1..059b48b 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.090000 1.075000 0.440000 1.285000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
index 2dcd539..60e7a5b 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.085000 1.075000 0.440000 1.285000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
index ad78d41..90b749f 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 4.230000 1.075000 4.725000 1.285000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
index 7071095..1655bbf 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.085000 1.075000 0.435000 1.285000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.767000 ;
     DIRECTION OUTPUT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
index 2ad1e28..32997a5 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.090000 1.075000 0.420000 1.615000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
index a784435..435ad9c 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.090000 1.075000 1.335000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
@@ -119,6 +107,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
index fda94be..39d6475 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.715000 1.000000 1.085000 1.315000 ;
     END
   END C2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.680000 0.240000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.897600 ;
     DIRECTION OUTPUT ;
@@ -119,6 +107,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.680000 0.240000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
index 05c57b6..dbe72f5 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.085000 1.075000 0.575000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
index a4d76fd..59b9c94 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.090000 1.075000 0.575000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
index 66cf06e..7381855 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 3.850000 1.075000 4.180000 1.445000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
index 6e6d3b9..8ef2f4f 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.125000 0.765000 0.575000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.858000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
index acd893f..69de904 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.150000 1.075000 0.780000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.141000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
index c37d80c..ff1bc43 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.090000 1.075000 1.895000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
index d056171..2dd972e 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.820000 0.765000 3.080000 1.355000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
index 607ea27..026c82f 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 3.270000 0.765000 3.530000 1.355000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
index 5c7a364..bd53974 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.805000 1.075000 1.345000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
index 41b6a20..d5446ce 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.440000 0.425000 2.610000 0.995000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.515500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
index eb9f058..f092a0d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.940000 1.075000 1.480000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
index 0073f51..b210c03 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
@@ -64,18 +64,6 @@
         RECT 1.725000 1.075000 3.075000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
index 752cc72..4564ea2 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 3.350000 0.995000 3.535000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.454000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
index 851b96a..e00c3ac 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 3.695000 0.995000 4.005000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
index f294829..eaa6d04 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.135000 0.745000 0.350000 1.625000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.904000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
index 4ac1b76..157a356 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 2.445000 0.995000 2.685000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.659750 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
index f460c58..2cb068b 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 5.175000 1.295000 5.410000 1.625000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.141000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
index ff11b0e..422fc4a 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 7.935000 0.995000 9.530000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.898500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
index 9b505ed..620d44a 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.375000 0.995000 2.620000 1.655000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.437250 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
index abd9bae..c9ee1a9 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 2.895000 0.755000 3.090000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
index ce42f07..e27a09b 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
@@ -68,18 +68,6 @@
         RECT 3.815000 0.745000 4.030000 1.075000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
index d949817..608ace7 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 1.965000 0.995000 2.215000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.481250 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
index a1d06dd..e54540c 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 4.265000 1.275000 4.490000 1.625000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.922000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
index a12b3f9..83991a1 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 5.670000 0.995000 6.855000 1.630000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.443500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
index 46a7e4f..4f4e35a 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 3.325000 1.325000 3.530000 1.615000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.544500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
index b4f685b..44b1155 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 1.115000 0.745000 1.530000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.695500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
index 8d7cdc6..ef4e667 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 7.030000 1.295000 7.225000 1.635000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
index 1a924be..1b8a069 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
@@ -74,18 +74,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.575500 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
index 36c5538..645e8b5 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.145000 1.285000 0.325000 1.625000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
index c2bc3c7..5869498 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.110000 1.305000 0.330000 1.965000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
index b82e02e..54401cb 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 1.005000 1.075000 1.335000 1.635000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
index fea54a2..a8bde86 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 1.400000 1.075000 1.730000 1.295000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
index b95d9e2..81d5a3c 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.135000 1.075000 3.145000 1.280000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
index d2b6a31..a657428 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.540000 0.965000 0.780000 1.665000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.669500 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
index cb5e5a6..c918137 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.545000 1.075000 1.555000 1.280000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
index b69e1d8..9ec8f83 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.105000 1.305000 0.325000 1.965000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
index 0666441..08a90f8 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.940000 1.080000 1.270000 1.615000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.280900 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
index 6fbe58c..4b51f77 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
@@ -44,18 +44,6 @@
         RECT 0.995000 1.075000 1.335000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.657000 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
index 8a5965b..b582a8a 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
@@ -44,18 +44,6 @@
         RECT 1.005000 1.075000 1.335000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.643500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
index b34bc21..d0f0fa1 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.605000 0.995000 0.980000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
index b6b084b..088b31d 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.480000 1.645000 2.175000 1.955000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
index e9cb712..95a9631 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.505000 1.645000 2.200000 1.955000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
index f206541..8358259 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
@@ -45,18 +45,6 @@
         RECT 0.610000 0.995000 0.975000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.934000 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
index 6447a51..1ff4879 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.145000 0.790000 1.475000 1.215000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
index 48a2e43..b04aedb 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.065000 0.750000 1.475000 1.245000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
index 00d6020..e7e39aa 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.525000 0.995000 1.900000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
index 9a33794..2145add 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.985000 0.725000 2.395000 1.245000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
index 85ec405..57de33c 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.010000 0.765000 2.420000 1.245000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
index b70e6a6..5764e5c 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.525000 0.995000 1.715000 1.340000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.934000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
index ec4529c..4516a76 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 1.895000 0.355000 2.175000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
index e05bb9d..71a2984 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 1.900000 0.415000 2.160000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.544500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
index 00bcb3c..a2e826e 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
@@ -63,18 +63,6 @@
         RECT 1.905000 0.935000 2.075000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
index 9fe72b5..b7cf14e 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.485000 0.665000 2.825000 1.695000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
index 5092e6a..03a9e06 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.445000 0.645000 2.775000 1.615000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.503250 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
index e353a78..fe78d6e 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.865000 0.995000 3.085000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
index d9744f3..9943fac 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 3.350000 1.325000 3.545000 1.635000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.425400 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
index c0da428..e6eb2b2 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.350000 0.425000 3.655000 1.405000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
index 735bb72..ae38533 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.680000 0.995000 3.080000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
index 48e2519..0663edf 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 0.985000 0.445000 1.355000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
index 4750d7a..04d6d08 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.135000 1.075000 1.660000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.570000 -0.085000 0.740000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  2.673000 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.570000 -0.085000 0.740000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
index e2a0237..6c9ad3d 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 2.485000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
index 163393d..6694fca 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.985000 0.440000 1.355000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
index c752b6a..b0ee389 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.090000 1.075000 0.470000 1.315000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -70,6 +58,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
index 4a5d0b5..58e6c8f 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.280000 1.075000 1.185000 1.315000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.336500 ;
     DIRECTION OUTPUT ;
@@ -72,6 +60,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
index 9983b4b..42e3dd5 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
index 40f7a44..e507b7f 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
index d4e4eaa..854ac70 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
index 126cff6..2b6a89d 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.090000 1.075000 1.265000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
index e8fb7c9..70e6097 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 0.505000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
index a6f35a8..8dd8be2 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.945000 0.985000 1.275000 1.355000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
index 08f4e4f..5908b3d 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
index c3c0dc2..44ac828 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.425000 0.745000 0.785000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.383400 ;
     DIRECTION OUTPUT ;
@@ -68,6 +56,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
index 570cfec..c1b55f3 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.425000 0.755000 0.775000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.795200 ;
     DIRECTION OUTPUT ;
@@ -72,6 +60,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
index da709cd..0ab9b5b 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.590400 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
index 7fdd9cf..16eac49 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.055000 0.560000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.376300 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
index 082a858..5c1d3d4 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.060000 0.555000 1.625000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.397600 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
index 373085d..301897e 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.055000 0.550000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.376300 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
index bdbee7e..028de47 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 0.560000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.397600 ;
     DIRECTION OUTPUT ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
index 0a47a19..b142ded 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 0.485000 1.320000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.702900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
index 0be7f12..4b101c5 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.995000 0.495000 1.615000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.497000 ;
     DIRECTION OUTPUT ;
@@ -68,6 +56,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
index 058c53f..e3c5ceb 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 0.535000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
index 97ec6dd..d54f1fb 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 0.480000 1.285000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.390500 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
index ee27687..539eff4 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.336000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
index 82e7941..82877c4 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 9.285000 1.260000 10.035000 1.305000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  4.520900 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
index 8f815db..0c78a29 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.065000 1.305000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.662600 ;
     DIRECTION OUTPUT ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
index 154d504..e0befae 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.445000 1.065000 2.660000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.075200 ;
     DIRECTION OUTPUT ;
@@ -72,6 +60,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
index a414922..f486748 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.455000 1.035000 4.865000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.090400 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
index c4a7523..1b73378 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.145000 0.995000 0.600000 1.665000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.436750 ;
     DIRECTION OUTPUT ;
@@ -65,6 +53,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
index 5e92251..f05a1f1 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.745000 0.425000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.714000 ;
     DIRECTION OUTPUT ;
@@ -68,6 +56,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
index c7d3fc5..9245d35 100644
--- a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
@@ -41,18 +41,6 @@
         RECT 0.775000 0.915000 1.295000 2.465000 ;
     END
   END LO
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -62,6 +50,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
index 6692793..589502e 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
@@ -25,18 +25,6 @@
   SIZE  5.520000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
index 686e4b2..d249dac 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.380000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
index 8b9f437..a403ce7 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
index 59b2319..f9d1f5a 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
@@ -25,18 +25,6 @@
   SIZE  2.760000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
index 7759793..2782006 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
index 2159509..a722e1f 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
@@ -91,18 +91,6 @@
         RECT 7.515000 0.920000 7.805000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -121,6 +109,22 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
index a5422e6..a1644c0 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
@@ -91,18 +91,6 @@
         RECT 7.460000 0.920000 7.750000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.070000 2.910000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -121,6 +109,22 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
index f09e24b..3346471 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
@@ -91,18 +91,6 @@
         RECT 7.450000 0.920000 7.740000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -121,6 +109,22 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
index 96aa781..56b0201 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
@@ -84,18 +84,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.770000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
index 5cb0a3d..e41fb84 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
index a5a2355..612d062 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
@@ -74,18 +74,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
index c781af4..fc84760 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
@@ -74,18 +74,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
index f5c6c3f..c1a109f 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
@@ -74,18 +74,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
index 104efdd..c559e66 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
@@ -78,18 +78,6 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.770000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
index 2d6accc..36f18a0 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
@@ -80,18 +80,6 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.770000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
index b843370..5d86f06 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
@@ -83,18 +83,6 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
index dc9c27c..878008b 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 7.050000 0.920000 7.340000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
index 9a0ca4b..ec50847 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
index cdb4ddf..45a7b20 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
@@ -77,18 +77,6 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
index 164e41b..642d088 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
@@ -60,18 +60,6 @@
         RECT 8.415000 0.910000 8.650000 1.480000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
index 689f9ee..aaa2495 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
@@ -60,18 +60,6 @@
         RECT 8.930000 0.885000 9.145000 1.495000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
index b6a493a..aa2cd9c 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
@@ -49,18 +49,6 @@
         RECT 7.105000 0.865000 7.275000 1.445000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
index 123e425..9c9b032 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
@@ -49,18 +49,6 @@
         RECT 7.105000 0.865000 7.275000 1.445000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
index 44654c5..47820e4 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
@@ -49,18 +49,6 @@
         RECT 8.410000 0.900000 8.655000 1.465000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
index 8db36a6..f80a447 100644
--- a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
@@ -35,18 +35,6 @@
         RECT 0.085000 0.255000 0.835000 2.465000 ;
     END
   END DIODE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.110000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -56,6 +44,22 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
index 62a9fb7..d9e1bea 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
@@ -46,20 +46,6 @@
         RECT 6.170000 0.595000 6.355000 1.495000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 0.995000 1.355000 ;
-        RECT -0.190000 1.355000 6.630000 2.910000 ;
-        RECT  2.620000 1.305000 6.630000 1.355000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
@@ -94,6 +80,24 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.995000 1.355000 ;
+        RECT -0.190000 1.355000 6.630000 2.910000 ;
+        RECT  2.620000 1.305000 6.630000 1.355000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
index 503bbf6..126aa29 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
@@ -46,20 +46,6 @@
         RECT 6.165000 0.595000 6.360000 1.495000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 0.995000 1.355000 ;
-        RECT -0.190000 1.355000 7.090000 2.910000 ;
-        RECT  2.625000 1.305000 7.090000 1.355000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
@@ -92,6 +78,24 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.995000 1.355000 ;
+        RECT -0.190000 1.355000 7.090000 2.910000 ;
+        RECT  2.625000 1.305000 7.090000 1.355000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
index 8eb15f2..7ca61b1 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
@@ -51,18 +51,6 @@
         RECT 6.970000 2.005000 7.300000 2.465000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.406500 ;
     DIRECTION INPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
index dd5dedd..ef28eeb 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 4.470000 0.995000 5.455000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
index 564a596..4eef0be 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 4.390000 0.995000 5.140000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
index d9eb9be..0d5539b 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 4.450000 0.995000 5.435000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
index bfc7b83..ea1e8be 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 4.400000 0.995000 5.150000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
index d992c30..c345705 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 4.500000 0.995000 5.435000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
index 5cb5989..bfb759e 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 4.480000 0.995000 5.170000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
index aee05c7..a264eea 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
@@ -58,18 +58,6 @@
         RECT 4.505000 0.995000 5.145000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
index 29a7e68..38ec68d 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
@@ -55,18 +55,6 @@
         RECT 4.745000 0.995000 5.075000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
index 803ee92..20e70a8 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 4.480000 1.035000 5.240000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
index cac1547..c5aa222 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
@@ -58,18 +58,6 @@
         RECT 4.505000 0.995000 5.145000 1.325000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
index 3d8fe76..0f153ce 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
@@ -56,18 +56,6 @@
         RECT 6.625000 0.825000 6.815000 1.505000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
index 4f85c87..5093de5 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 7.095000 1.325000 7.305000 1.445000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
index 2c81eca..3335627 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
@@ -56,18 +56,6 @@
         RECT 6.600000 0.825000 6.815000 1.445000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
index 26a5f4d..8c09ca7 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
@@ -45,18 +45,6 @@
         RECT 5.265000 0.745000 5.435000 1.670000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
index 4674655..1e7994d 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
@@ -49,18 +49,6 @@
         RECT 5.330000 1.325000 5.500000 1.495000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
index a9887f5..fa196d1 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
@@ -49,18 +49,6 @@
         RECT 6.115000 1.325000 6.385000 2.455000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
index 5598d43..8a29e3a 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
@@ -45,18 +45,6 @@
         RECT 5.265000 0.745000 5.435000 1.670000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
index efd3fce..e9e4680 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.055000 0.555000 1.615000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
index cca631d..287b1dc 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.055000 0.625000 1.615000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
index 839a744..a1c1573 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.055000 0.775000 1.615000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
index 12350bf..a2e556b 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.995000 0.570000 1.700000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.120000 -0.085000 0.290000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     ANTENNAGATEAREA  0.126000 ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
index 0f78a4d..c44854e 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.995000 0.570000 1.700000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.120000 -0.085000 0.290000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     ANTENNAGATEAREA  0.126000 ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
index e33d215..498b395 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.995000 0.575000 1.700000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
index 2f7e7c1..e3361b6 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.910000 1.075000 1.240000 1.630000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.601000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
index 873f054..f9d0cf2 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.950000 0.765000 1.280000 1.275000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
index 75f0c93..a3a9d6f 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.950000 0.765000 1.280000 1.425000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
index 0d0ec63..a0bca2c 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
@@ -45,18 +45,6 @@
         RECT 0.970000 1.325000 1.305000 1.695000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
index 7f993eb..ebb34d6 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 9.515000 0.255000 9.845000 1.065000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
index def28d5..4bf6600 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 10.465000 0.305000 10.795000 2.420000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
index 91266f6..07e75b1 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.650000 1.725000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.275600 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
index 09d06f4..70741cd 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.955000 0.510000 1.725000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
index 08e65a1..fb90828 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.325000 1.385000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.694800 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
index 70452a2..9a1fae3 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
index 049d343..d334a9f 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.090000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
index 19ad140..644dec4 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.545000 1.725000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
index 73886a2..c99e78e 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +61,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
index 51ad741..0309cb6 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
index f243206..a485a3e 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
index 6e0c7df..1ce7a9a 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
@@ -138,18 +138,6 @@
         RECT 6.910000 0.810000 7.240000 1.485000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -159,6 +147,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
index c24125d..a7fc6fa 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
@@ -150,18 +150,6 @@
         RECT 7.970000 0.905000 8.195000 1.415000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -171,6 +159,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
index 6deeb6e..4db4fe9 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
@@ -154,18 +154,6 @@
         RECT 9.700000 0.905000 10.035000 1.415000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -175,6 +163,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
index 83d9e0f..99320c7 100644
--- a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
@@ -94,18 +94,6 @@
         RECT 12.110000 0.825000 12.335000 1.785000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.610000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -115,6 +103,22 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
index 957c986..7d12515 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
@@ -91,18 +91,6 @@
         RECT 12.125000 0.825000 12.335000 1.785000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.610000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
index 6f48b4f..ca369c7 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
@@ -91,18 +91,6 @@
         RECT 12.135000 0.825000 12.335000 1.785000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.610000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
index 7628584..b06b8a1 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.055000 0.260000 0.055000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 0.650000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.055000 0.260000 0.055000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
index 61ee73a..68bb8b8 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.920000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.155000 -0.050000 0.315000 0.060000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.110000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.050000 0.315000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
index fee7f84..9e81930 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.175000 -0.060000 0.285000 0.060000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.175000 -0.060000 0.285000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
index 5a73bc7..a9fffaf 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.130000 -0.120000 0.350000 0.050000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.120000 0.350000 0.050000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
index b43be3b..11d1689 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.090000 1.565000 0.425000 2.415000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
index 4978d22..8fc30e4 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.555000 1.565000 0.885000 2.415000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
index 1265c67..02e2b93 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
@@ -89,18 +89,6 @@
         RECT 1.355000 1.565000 1.685000 2.415000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
index 23f2454..8b7c33b 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.320000 1.075000 0.650000 1.315000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
index a520cc8..ed60c3b 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.680000 1.075000 5.270000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.673000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
index 2642e54..b5c7686 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.075000 5.525000 1.315000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
index 4156800..063247b 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.075000 0.435000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
index 5780851..5cfbc32 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.075000 1.735000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -71,6 +59,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
index 2223d30..efe2371 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.075000 2.615000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.336500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +61,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
index 0472646..6385e66 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.680000 1.075000 3.535000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
index 18c97b7..0c89c92 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.275000 1.040000 1.975000 1.730000 ;
     END
   END SHORT
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -55,6 +43,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
index bae705c..28e1040 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.945000 0.985000 1.275000 1.355000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
index 3ccf73f..fd68898 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
@@ -169,6 +157,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
index e6091a9..5812745 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.425000 0.745000 0.785000 1.240000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.383400 ;
     DIRECTION OUTPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
index 33cee19..595ab7b 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.425000 0.755000 0.775000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.795200 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
index 80c30ff..fbac9c1 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.590400 ;
     DIRECTION OUTPUT ;
@@ -125,6 +113,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
index f3e1602..516dcf1 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.336000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
index 400e224..f32c8f0 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 9.285000 1.260000 10.035000 1.305000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  4.520900 ;
     DIRECTION OUTPUT ;
@@ -195,6 +183,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
index f185070..798dd4e 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.085000 1.065000 1.305000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.662600 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
index 867730a..c834575 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.445000 1.065000 2.660000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.075200 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
index a8946bf..47b85eb 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.455000 1.035000 4.865000 1.290000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.090400 ;
     DIRECTION OUTPUT ;
@@ -131,6 +119,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
index f898b32..f5d4a5f 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
@@ -25,18 +25,6 @@
   SIZE  5.520000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
index 3b4419e..094897c 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.380000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -65,6 +53,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
index e3a1a52..52836a3 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
index 816832c..3bb04e3 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
@@ -25,18 +25,6 @@
   SIZE  2.760000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -68,6 +56,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
index a07a788..5fad402 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -70,6 +58,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
index 4e6509a..804a84b 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
@@ -44,18 +44,6 @@
         RECT 0.995000 1.075000 1.335000 1.325000 ;
     END
   END SLEEP_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.657000 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
index f114c2f..247d8ba 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.145000 0.765000 0.445000 1.615000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
index 53bbe65..35e0b36 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END SLEEP_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
index e0f879b..750c218 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.010000 0.765000 1.275000 1.325000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.509000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
index 74d86fa..753db72 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
@@ -45,18 +45,6 @@
         RECT 4.805000 0.745000 4.975000 1.670000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN SLEEP_B
     ANTENNAGATEAREA  0.145500 ;
     DIRECTION INPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
index 556ad01..d344ca1 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.960000 1.065000 1.325000 1.325000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
index e82b805..92f627a 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
@@ -44,18 +44,6 @@
         RECT 9.450000 1.075000 15.650000 1.285000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 16.750000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  4.968000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.750000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
index 64e271a..f468be4 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
@@ -44,18 +44,6 @@
         RECT 0.480000 1.065000 0.920000 1.275000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
index 6c7c5e5..070a86b 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.360000 1.075000 1.800000 1.275000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
index e9b02c9..7d98c0b 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
@@ -44,18 +44,6 @@
         RECT 5.270000 1.075000 8.010000 1.275000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  2.484000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
index fe09fde..89b2d65 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
@@ -43,22 +43,6 @@
         RECT 3.260000 1.075000 4.700000 1.275000 ;
     END
   END SLEEP
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 14.450000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
@@ -182,6 +166,26 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 5.205000 -0.085000 5.375000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
index 29e561b..39d2d37 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 6.170000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 5.870000 3.455000 6.160000 3.500000 ;
-        RECT 5.870000 3.640000 6.160000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.402500 ;
     DIRECTION OUTPUT ;
@@ -62,8 +51,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 5.925000 4.595000 6.095000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 6.170000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 5.870000 3.455000 6.160000 3.500000 ;
+        RECT 5.870000 3.640000 6.160000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 6.630000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -93,6 +100,8 @@
         RECT 0.070000 2.140000 6.170000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END VPWRIN
   OBS
@@ -182,6 +191,9 @@
       RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
+      RECT 5.925000 0.320000 6.095000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
index af47358..de676b1 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 6.300000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 6.010000 3.455000 6.300000 3.500000 ;
-        RECT 6.010000 3.640000 6.300000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.610500 ;
     DIRECTION OUTPUT ;
@@ -62,8 +51,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 6.125000 4.595000 6.295000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 6.300000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 6.010000 3.455000 6.300000 3.500000 ;
+        RECT 6.010000 3.640000 6.300000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 6.630000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -93,6 +100,8 @@
         RECT 0.070000 2.140000 6.370000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END VPWRIN
   OBS
@@ -183,6 +192,8 @@
       RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
index 6cb2f12..0393b1b 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 7.290000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 6.930000 3.455000 7.220000 3.500000 ;
-        RECT 6.930000 3.640000 7.220000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.072500 ;
     DIRECTION OUTPUT ;
@@ -66,8 +55,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 7.360000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 7.045000 4.595000 7.215000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 7.290000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 6.930000 3.455000 7.220000 3.500000 ;
+        RECT 6.930000 3.640000 7.220000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 7.405000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -97,6 +104,8 @@
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END VPWRIN
   OBS
@@ -195,6 +204,8 @@
       RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
index a8d356a..be2a9d8 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.075000 5.245000 0.200000 5.395000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT 4.250000 1.305000 7.405000 4.135000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.072500 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,8 @@
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END LOWLVPWR
   PIN VGND
@@ -91,6 +81,22 @@
         RECT 0.000000 5.200000 7.360000 5.680000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.075000 5.245000 0.200000 5.395000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT 4.250000 1.305000 7.405000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -191,7 +197,6 @@
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
     LAYER nwell ;
       RECT -0.190000 1.305000 0.650000 4.135000 ;
-      RECT  1.920000 1.305000 2.980000 4.135000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
index d0b963a..8ff4f16 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 6.170000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 5.870000 3.455000 6.160000 3.500000 ;
-        RECT 5.870000 3.640000 6.160000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.402500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +64,8 @@
         RECT 0.070000 2.140000 6.170000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END LOWLVPWR
   PIN VGND
@@ -84,8 +75,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 5.925000 4.595000 6.095000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 6.170000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 5.870000 3.455000 6.160000 3.500000 ;
+        RECT 5.870000 3.640000 6.160000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 6.630000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -182,6 +191,9 @@
       RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
+      RECT 5.925000 0.320000 6.095000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
index a5553ec..51af70d 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 6.300000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 6.010000 3.455000 6.300000 3.500000 ;
-        RECT 6.010000 3.640000 6.300000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.610500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +64,8 @@
         RECT 0.070000 2.140000 6.370000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END LOWLVPWR
   PIN VGND
@@ -84,8 +75,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 6.125000 4.595000 6.295000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 6.300000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 6.010000 3.455000 6.300000 3.500000 ;
+        RECT 6.010000 3.640000 6.300000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 6.630000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -183,6 +192,8 @@
       RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
index 2735eaa..5178615 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
@@ -34,17 +34,6 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.070000 3.500000 7.290000 3.640000 ;
-        RECT 0.080000 3.455000 0.370000 3.500000 ;
-        RECT 0.080000 3.640000 0.370000 3.685000 ;
-        RECT 6.930000 3.455000 7.220000 3.500000 ;
-        RECT 6.930000 3.640000 7.220000 3.685000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.072500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +68,8 @@
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
         RECT 1.360000 2.280000 2.370000 2.315000 ;
+      LAYER nwell ;
+        RECT 1.920000 1.305000 2.980000 4.135000 ;
     END
   END LOWLVPWR
   PIN VGND
@@ -88,8 +79,26 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 7.360000 5.680000 ;
+      LAYER pwell ;
+        RECT 0.145000 4.595000 0.315000 5.120000 ;
+        RECT 7.045000 4.595000 7.215000 5.120000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.070000 3.500000 7.290000 3.640000 ;
+        RECT 0.080000 3.455000 0.370000 3.500000 ;
+        RECT 0.080000 3.640000 0.370000 3.685000 ;
+        RECT 6.930000 3.455000 7.220000 3.500000 ;
+        RECT 6.930000 3.640000 7.220000 3.685000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 4.135000 ;
+        RECT  4.250000 1.305000 7.405000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -195,6 +204,8 @@
       RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    LAYER pwell ;
+      RECT 0.145000 0.320000 0.315000 0.845000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
 END LIBRARY
diff --git a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
index 7b95bd3..ece8317 100644
--- a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
+++ b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
@@ -74,18 +74,6 @@
         RECT 8.425000 1.260000 8.715000 1.305000 ;
     END
   END LO
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.530000 2.910000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -142,6 +130,22 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
index 0166dc2..50e6621 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.415000 0.765000 2.755000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.602250 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
index ec2577e..13e54b2 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 2.415000 1.415000 3.070000 1.495000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
index 90cd75b..4f0669c 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
@@ -58,18 +58,6 @@
         RECT 2.460000 1.245000 2.630000 2.225000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
index 74a9cbf..3caccc3 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 2.795000 1.630000 2.965000 2.295000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.420000 -0.085000 0.590000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.590000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
index 322f284..baf5b63 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
@@ -55,18 +55,6 @@
         RECT 3.360000 0.755000 3.550000 1.625000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
index 62e387b..01aff03 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 2.680000 0.995000 3.395000 1.325000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
index f372a75..0af7b56 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
@@ -93,18 +93,6 @@
         RECT 9.280000 1.600000 9.570000 1.645000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -133,6 +121,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
index 857a3be..eaa19e9 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
@@ -55,18 +55,6 @@
         RECT 3.260000 0.760000 3.595000 1.620000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.480500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
index f291930..a5a27bb 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.580000 0.725000 0.780000 0.995000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.691250 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
index a9ab2eb..2a993d3 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 7.680000 0.995000 7.850000 1.425000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.194500 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
index 1e5e62b..5c22359 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 6.055000 0.995000 6.345000 1.675000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
index 082ca44..63df1d4 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
@@ -108,18 +108,6 @@
         RECT 2.785000 0.715000 3.075000 1.320000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -141,6 +129,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
index 7053e53..29c49b6 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
@@ -108,18 +108,6 @@
         RECT 2.790000 0.715000 3.080000 1.320000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -145,6 +133,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
index d4c239b..02cadb7 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
index 1d11d2d..6531e3d 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 1.075000 0.845000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
index 2b905e8..4bdc41c 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.110000 1.075000 1.730000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
index 7df348d..2f5f618 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.510000 1.075000 3.365000 1.295000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.862000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
index 39111b5..83d1770 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.610000 1.075000 1.085000 1.315000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
index 66f5f7e..1a8f1ce 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
@@ -44,18 +44,6 @@
         RECT 1.990000 1.275000 2.180000 1.655000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.775500 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
index 74deb84..948de4f 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 3.155000 1.075000 4.940000 1.275000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
index 441b1ff..9b722d2 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.699000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
index 4594ae8..37b67f4 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.470000 1.075000 3.595000 1.275000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
index 3219d92..0aa2250 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.110000 1.075000 1.700000 1.275000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
index 409a08f..ce83a1f 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.965000 0.995000 1.235000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.732000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
index fccd6d2..788c353 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.060000 1.075000 1.740000 1.275000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
index ea01851..2f5e17a 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 4.790000 1.075000 6.500000 1.275000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
index 953c8f6..b7bccc3 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.795000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
index 11a7f03..eae3efd 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.110000 1.075000 0.845000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
index 53a76a4..1f5968b 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.105000 1.075000 1.700000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
index c218e31..5b8de88 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.965000 0.995000 1.235000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.887500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
index 1bb3141..62b6db0 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 4.620000 1.075000 5.430000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
index b28eef2..b1bbb26 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 7.015000 1.075000 8.655000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
index 5d7b36f..a8dabf7 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.970000 1.075000 1.320000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.909000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
index 70d1af8..616bb36 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 4.945000 1.075000 5.875000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
index 273fbb5..6a59147 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 8.420000 1.075000 10.015000 1.275000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
index aaadf66..ae15c28 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 1.570000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
index 4914234..dba4eec 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.980000 1.075000 1.750000 1.275000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
index 78c4cea..a805c20 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.120000 1.075000 3.485000 1.275000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
index cef5df6..d95ef2e 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 3.800000 1.075000 6.540000 1.275000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.484000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
index 0b64bf3..bb7e6d3 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.100000 0.725000 0.325000 1.325000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
index 620df72..eec291e 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
@@ -44,18 +44,6 @@
         RECT 2.910000 1.275000 3.125000 1.965000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
index d592c7e..8258ffb 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 4.445000 1.075000 4.975000 1.320000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
index 18ca3d9..efdc477 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.604500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
index db44e08..492df0b 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.375000 1.285000 2.640000 1.625000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
index 911fa86..d69af97 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 3.855000 1.075000 4.765000 1.275000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
index 8db57d6..ba6c67d 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.716500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
index 26ac90f..9b0e7e4 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 4.030000 1.075000 4.515000 1.285000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
index d7f2a99..23c41d6 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
index 98acec4..2c2d6a4 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.672750 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
index 4494357..b26c841 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.340000 1.075000 3.925000 1.285000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
index fd127e6..3d79632 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 5.875000 1.075000 7.295000 1.285000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
index 41949b2..ab98892 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.445000 0.995000 2.795000 1.615000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.871000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
index a220eb0..654a85b 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 5.185000 1.285000 5.435000 1.955000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
index 6053618..f88b3ae 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 7.810000 1.075000 8.655000 1.285000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
index 62ca55e..6c1cbbf 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 0.950000 0.995000 1.240000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.606900 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
index fd0dea0..c3477ae 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.425000 0.995000 0.780000 1.695000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
index 36f960f..38bd72c 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.955000 1.075000 1.295000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
index 4af9d9b..7144755 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 1.535000 0.390000 1.745000 1.075000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
index 9587e2e..bc883b7 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 1.505000 1.075000 1.835000 1.615000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
index 8e9d4bd..4f88e66 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.120000 0.995000 0.340000 1.655000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.962500 ;
     DIRECTION OUTPUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
index 106e518..44fecbc 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.485000 1.075000 0.815000 1.615000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.857250 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
index 35e66ad..c3902f6 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.085000 1.075000 0.425000 1.355000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.302000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
index 86d41df..b34dadb 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.545000 1.075000 1.755000 1.345000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.984350 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
index 6e52b0b..a647a2e 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.245000 1.075000 3.595000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
index 9f8313b..81c6059 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
index 9ba70a9..0819e6f 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 3.055000 1.035000 3.740000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.911000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
index 40e840d..86a453c 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 1.970000 1.075000 2.300000 1.615000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.418250 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
index 00ed08c..fc9ba55 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.022000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
index 914eace..440f2ee 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 5.370000 1.075000 6.440000 1.345000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.001000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
index 5472d58..50d1abb 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
@@ -55,18 +55,6 @@
         RECT 1.065000 1.075000 1.535000 1.305000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
index 3c96400..6b40120 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.445000 1.010000 1.855000 1.615000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
index b629a1e..123c245 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
@@ -54,18 +54,6 @@
         RECT 2.485000 1.075000 3.155000 1.615000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
index 1c34fa7..87251a0 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.515000 1.355000 1.730000 1.685000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.290500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
index af8a738..ce9c370 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.505000 1.295000 1.750000 1.655000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.517000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
index c369c4e..0c82ee9 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 2.815000 0.765000 3.130000 1.400000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.742000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
index 076ea5c..face49c 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
@@ -55,18 +55,6 @@
         RECT 3.905000 1.015000 5.255000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.484000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
index 84396e9..abf74d2 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.030000 0.995000 1.360000 1.325000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
index 7b64e84..872c3bd 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.595000 1.325000 0.775000 1.695000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
index cfbad32..b3e8448 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.605000 1.285000 0.885000 1.705000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
index a1acc94..922a9f1 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.474000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
index 7950cbf..80f37f1 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.085000 0.995000 0.525000 1.325000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
index 95aedeb..9ed32a6 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 1.075000 0.555000 1.285000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
index 69bb6ec..62a4265 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
index 6078448..62e0950 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.120000 -0.085000 0.290000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
index 9a5568b..6e151c3 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
index 6743202..ae59aa3 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.899000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
index 2c7dabc..c7cda6d 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
index 5beb7a7..46a0473 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.090000 1.075000 1.750000 1.275000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
@@ -119,6 +107,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
index 4df64ee..86d5bd5 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 1.530000 1.075000 1.995000 1.325000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
index a6a5d05..6782341 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
@@ -65,18 +65,6 @@
         RECT 1.960000 1.075000 2.425000 1.325000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.130000 -0.085000 0.300000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.085000 0.300000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
index eecda1d..3c47b0b 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 3.125000 1.075000 3.680000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
index 3364f4c..db74a6b 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.835000 1.415000 1.235000 1.665000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.650250 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
index 13bcef4..03ba6db 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 1.155000 1.075000 1.925000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
index b8dd2a2..6ce5f1e 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 5.110000 1.075000 6.460000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
index 85b731c..414db55 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 2.905000 1.325000 3.080000 2.425000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
index 9cce33f..c7bbad1 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
@@ -65,18 +65,6 @@
         RECT 3.355000 1.325000 3.525000 2.425000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.135000 -0.085000 0.305000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
index a0cd82c..bc74b1e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.805000 1.075000 1.345000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
index 59446fb..e8b7638 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 2.445000 1.325000 2.615000 2.425000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
index 55e652b..c5e9c72 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
@@ -65,18 +65,6 @@
         RECT 3.960000 1.075000 4.500000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
index d96edfe..ecf942a 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.465000 1.075000 7.875000 1.285000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.135000 -0.085000 0.305000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
index 34faf0c..0b6d185 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 3.350000 0.995000 3.595000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
index 2ff4f47..4fbc848 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 3.810000 0.995000 4.055000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
index 6239958..28920e3 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.115000 1.055000 3.080000 1.315000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
index 91ae724..4c9a853 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
@@ -71,18 +71,6 @@
         RECT 2.830000 0.765000 3.135000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.604000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
index a956607..e2c9955 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.830000 0.995000 3.135000 1.325000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.942000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
index ce7c34d..4a6814c 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 5.085000 1.055000 5.895000 1.315000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.551000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
index e37e653..8dcb136 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 7.865000 1.055000 9.090000 1.315000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.241000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
index 297e51a..349e635 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.390000 0.995000 2.795000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.594000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
index f61a0e1..8857a08 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.855000 0.995000 3.255000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.577500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
index d2c3545..c8c9171 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 2.780000 1.355000 3.150000 1.695000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
index 30bd3c1..cc7e624 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.330000 0.995000 2.675000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.006000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
index 9b8cb56..343923c 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 4.175000 0.755000 4.515000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.063500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
index cd094ba..e362a1a 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.465000 1.055000 7.735000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.683800 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
index 441cd73..ea8643f 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 2.440000 0.995000 2.795000 1.660000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
index 5bc13c5..c3b4a9c 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 2.910000 0.995000 3.155000 1.615000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
index f6e3ddf..83c85c2 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 4.790000 1.075000 5.260000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
index d2dc5eb..76f3ede 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.870000 0.995000 1.240000 1.615000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.821250 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
index fdf3583..c1387fa 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.090000 1.075000 0.845000 1.325000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
index 4656746..c91cd98 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.110000 1.075000 1.685000 1.275000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
index 8a00992..da66a22 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.275000 1.075000 1.695000 1.285000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.672000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
index e54cf6d..3b5f684 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.775000 1.075000 2.155000 1.325000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
index 59c1f77..bca455f 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.835000 1.075000 3.165000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.010000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
index d7eb158..7af3b31 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.105000 1.075000 0.440000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
index 58a6abc..724c219 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.105000 1.075000 0.440000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
index 4d753e6..0b88ef1 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.105000 1.075000 1.700000 1.275000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
index b7b993e..93f44c7 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.145000 0.995000 0.500000 1.615000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.326800 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
index b03d0a0..dd88fc8 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.145000 0.765000 0.500000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.509000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
index 610cf1e..700bfbf 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.150000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
index 148c605..0ca31cd 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
index 5f5724b..b0ec01d 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
index 72c44d8..fdd56bd 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
index 7ae3fdc..19ece3d 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
index 46c9f30..f28c7e4 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
index 815e886..5bf3bff 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 0.995000 0.435000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
index f6f9fbe..487ad9f 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
index 7b999cc..3bbdb08 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
index 255bf76..85b209b 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
index eca80d2..3218df6 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
index 4c3b13e..178ea30 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.950000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
index 5c53fbd..76c5f7c 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.085000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
index 4b68394..b80275c 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.140000 -0.085000 0.310000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
index 001e1c9..20a234e 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
index 6518808..cb58b8f 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
index b9a127e..598f241 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
index a8faaf4..8226aee 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.945000 0.995000 1.235000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
index fedf267..291c75c 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.950000 0.995000 1.240000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
index 03a2f22..8a46773 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
@@ -64,18 +64,6 @@
         RECT 0.945000 0.995000 1.235000 1.325000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
index 6b01c51..cc7f355 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
index cd786c6..590b62d 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.710000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
@@ -71,6 +59,22 @@
         RECT 4.360000 -1.170000 6.675000 0.560000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
index be75c76..45e9b40 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
@@ -113,18 +113,6 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 14.450000 2.910000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -143,6 +131,22 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
index 3d36fcf..defd67c 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
@@ -111,18 +111,6 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 15.370000 2.910000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -141,6 +129,22 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.370000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
index b8b4f8a..abf5663 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
@@ -111,18 +111,6 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 14.450000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -141,6 +129,22 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
index 19c3cfe..d8aa8f1 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
@@ -106,20 +106,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.405000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -138,6 +124,24 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.405000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
index 2add686..416bddd 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
@@ -104,20 +104,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 13.530000 2.910000 ;
-        RECT  4.405000 1.305000 13.530000 1.425000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -136,6 +122,24 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.530000 2.910000 ;
+        RECT  4.405000 1.305000 13.530000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
index ed5743c..e851f50 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
@@ -95,20 +95,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 11.690000 2.910000 ;
-        RECT  4.405000 1.305000 11.690000 1.425000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -127,6 +113,24 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 11.690000 2.910000 ;
+        RECT  4.405000 1.305000 11.690000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
index 7ea5b1e..b673a3a 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
@@ -95,20 +95,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 11.690000 2.910000 ;
-        RECT  4.405000 1.305000 11.690000 1.425000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -127,6 +113,24 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 11.690000 2.910000 ;
+        RECT  4.405000 1.305000 11.690000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
index 1ac0744..8641dd5 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
@@ -95,20 +95,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 12.150000 2.910000 ;
-        RECT  4.405000 1.305000 12.150000 1.425000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -127,6 +113,24 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 12.150000 2.910000 ;
+        RECT  4.405000 1.305000 12.150000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
index 43094d3..0dd7b1b 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
@@ -99,20 +99,6 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.215000 -0.010000 0.235000 0.015000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  1.970000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.405000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
@@ -131,6 +117,24 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.405000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
index 3be9fbd..7b5633c 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
@@ -112,18 +112,6 @@
         RECT 8.825000 1.600000 9.115000 1.645000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.530000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -144,6 +132,22 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
index c9bcd41..1771fa1 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
@@ -112,18 +112,6 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 14.450000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -144,6 +132,22 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
index 41e4e2d..39900f1 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
@@ -103,18 +103,6 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.610000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
index 8baa341..c109f23 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
@@ -103,18 +103,6 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.070000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
index 4842b92..bbeedbb 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
@@ -107,18 +107,6 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.990000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -139,6 +127,22 @@
         RECT 0.000000 -0.240000 13.800000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.990000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
index 534879f..a9e15e2 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
@@ -98,18 +98,6 @@
         RECT 3.065000 0.785000 3.235000 1.115000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -128,6 +116,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
index b541d8d..1433f24 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
@@ -81,18 +81,6 @@
         RECT 3.085000 0.785000 3.255000 1.115000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
index 9bd5f07..8b8ae88 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
@@ -68,18 +68,6 @@
         RECT 3.065000 0.785000 3.250000 1.095000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
index b173147..4d3fdf8 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 3.080000 0.785000 3.250000 1.115000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
index 7781695..8320079 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.085000 0.785000 3.255000 1.115000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.230000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
index 17353e6..ea82a79 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
@@ -56,18 +56,6 @@
         RECT 0.085000 0.955000 0.340000 1.665000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.090000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
index deefc79..68f4680 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.085000 0.955000 0.340000 1.665000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 7.550000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
index 1acf02d..df9c0c9 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.085000 0.955000 0.345000 1.665000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.406500 ;
     DIRECTION INPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
index 62b30ba..b91b82b 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
@@ -82,20 +82,6 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  4.885000 1.435000 ;
-        RECT -0.190000 1.435000 14.450000 2.910000 ;
-        RECT  7.200000 1.305000 14.450000 1.435000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -114,6 +100,24 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 14.450000 2.910000 ;
+        RECT  7.200000 1.305000 14.450000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
index edd137c..406c5d8 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
@@ -82,20 +82,6 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  4.885000 1.435000 ;
-        RECT -0.190000 1.435000 15.370000 2.910000 ;
-        RECT  7.200000 1.305000 15.370000 1.435000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -114,6 +100,24 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 15.370000 2.910000 ;
+        RECT  7.200000 1.305000 15.370000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
index f33a927..76c4ae9 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
@@ -71,20 +71,6 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  4.885000 1.435000 ;
-        RECT -0.190000 1.435000 13.530000 2.910000 ;
-        RECT  7.200000 1.305000 13.530000 1.435000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -103,6 +89,24 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 13.530000 2.910000 ;
+        RECT  7.200000 1.305000 13.530000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
index 89f7d1e..b300a17 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
@@ -71,20 +71,6 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  4.885000 1.435000 ;
-        RECT -0.190000 1.435000 13.990000 2.910000 ;
-        RECT  7.200000 1.305000 13.990000 1.435000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -103,6 +89,24 @@
         RECT 0.000000 -0.240000 13.800000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 13.990000 2.910000 ;
+        RECT  7.200000 1.305000 13.990000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
index 8fb5424..23931b9 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
@@ -75,20 +75,6 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000  4.885000 1.435000 ;
-        RECT -0.190000 1.435000 14.910000 2.910000 ;
-        RECT  7.200000 1.305000 14.910000 1.435000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
@@ -107,6 +93,24 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 14.910000 2.910000 ;
+        RECT  7.200000 1.305000 14.910000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
index 1dd776e..9c594a2 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
@@ -25,20 +25,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    ANTENNADIFFAREA  0.089250 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.265000 0.375000 0.810000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -48,6 +34,26 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 0.265000 0.375000 0.810000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 1.470000 0.375000 2.455000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
index e9ab2d6..687653d 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
@@ -25,20 +25,6 @@
   SIZE  0.920000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VNB
-    ANTENNADIFFAREA  0.330750 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.265000 0.835000 0.810000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.551250 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.835000 2.455000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -48,6 +34,26 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 0.265000 0.835000 0.810000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.775000 0.845000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 1.470000 0.835000 2.455000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
index 8fd2bc1..4c9e10e 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
@@ -25,13 +25,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.085000 2.095000 0.375000 2.325000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -39,8 +32,20 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.085000 2.095000 0.375000 2.325000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
index 42e1a1b..f225602 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
@@ -25,13 +25,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.085000 1.755000 0.375000 1.985000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -39,8 +32,20 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.085000 1.755000 0.375000 1.985000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
index 60fc040..235e6c7 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
@@ -32,6 +32,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
   PIN VPWR
@@ -41,6 +43,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
     END
   END VPWR
   OBS
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
index 495642b..c501aa1 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
@@ -46,18 +46,6 @@
         RECT 1.795000 1.245000 1.965000 1.445000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.525000 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
index e98e093..f909f1a 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
@@ -47,18 +47,6 @@
         RECT 2.930000 1.285000 3.100000 1.445000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.913000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
index 8c5e0df..6f1337f 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
@@ -47,18 +47,6 @@
         RECT 5.560000 1.275000 5.730000 1.445000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.721000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
index ed76819..802f555 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.615000 1.075000 2.180000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
index 6e00c3e..3a5d3d6 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.075000 1.075000 2.640000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
index 2982b01..bfb0f57 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.995000 1.075000 3.560000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.850000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
index e82549d..39ad8bb 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
@@ -46,18 +46,6 @@
         RECT 1.560000 1.245000 1.730000 1.445000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.800500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
index 746330c..bfd63ff 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.656750 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
index 2957cf2..dedf55d 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 2.970000 1.105000 5.740000 1.275000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.524450 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
index d0002bb..7a9a408 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.860000 0.995000 2.495000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.930000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
index fe9cffe..52ca382 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.320000 0.995000 2.955000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 9.390000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
index ca82e0b..740dbf9 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.880000 0.995000 3.515000 1.325000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.235000 -0.085000 0.405000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
@@ -123,6 +111,22 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.235000 -0.085000 0.405000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;