diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
index 11e5560..a08e952 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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.870000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.755000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.090000 1.685000 0.355000 2.455000 ;
     END
   END X
+  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.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
index 1fef04b..cab2fc2 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940000 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.605000 0.255000 0.835000 2.335000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
index e77f9ee..8c110b0 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.550000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 2.045000 0.255000 2.225000 0.615000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
index 3912baa..4ac5223 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.435000 0.815000 2.650000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
index eaec856..8914173 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 5.250000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.575000 0.855000 0.895000 2.115000 ;
     END
   END Y
+  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 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
index 8369e41..b4b1154 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -82,18 +82,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -123,6 +111,22 @@
         RECT 7.905000 0.825000 8.160000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
index 3a0b5f8..4c04a00 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.683400 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 3.715000 0.265000 3.995000 2.455000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
index 660ad9e..0af192e 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.937200 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.645000 2.005000 0.900000 2.425000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
index ca0b222..be70d89 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.050000 1.595000 2.580000 1.765000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
index bfdcf8c..504eede 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.535500 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 1.440000 0.265000 1.780000 1.045000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
index 45a49cc..f1e4e3c 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.705500 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 2.980000 0.255000 3.360000 0.615000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
index 350e166..da5c71b 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.465000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.555000 0.675000 5.385000 0.695000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
index e9553e5..e3b982b 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.095000 0.265000 0.355000 2.455000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
index 2748463..16b68e9 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.935000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 0.545000 0.255000 0.825000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
index f67b0c3..0a1e373 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 1.635000 1.755000 1.885000 2.185000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
index ff40b9f..d801acd 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 5.815000 1.615000 6.085000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
index 32eb4aa..2bb0598 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 6.755000 1.615000 7.025000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
index 428ddcb..d0e1b36 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.315000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.660000 0.265000 0.885000 0.645000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
index 7d441d1..7c928d3 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.590000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 2.545000 0.255000 2.865000 0.615000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
index 78796f6..10b1c79 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.210000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.475000 0.675000 4.305000 0.695000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
index 7bc3262..6a12082 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -126,6 +114,22 @@
         RECT 3.255000 0.825000 3.535000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
index 81d43df..8c70e3d 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -124,6 +112,22 @@
         RECT 4.415000 0.645000 4.795000 0.725000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
index e98c85b..90f444b 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -90,18 +90,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -133,6 +121,22 @@
         RECT 6.960000 0.645000 8.585000 0.735000 ;
     END
   END Y
+  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.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
index 7b505d3..f3c7a1c 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -93,18 +93,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.350000 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 2.410000 0.295000 2.975000 0.645000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
index ca00a64..5775445 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.600000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.365000 0.585000 3.535000 1.785000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
index 350a41d..dd33c73 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.240000 0.585000 3.560000 1.785000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
index 67109be..a04b14a 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
index cc047d7..8f7c4f0 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 2.795000 0.825000 3.135000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
index 9c9997c..cfcad4b 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -93,18 +93,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -146,6 +134,22 @@
         RECT 1.930000 0.845000 2.360000 1.485000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.345000 0.680000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
index f3dc7aa..6db9ae7 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 3.425000 1.625000 3.675000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
index b33a3f3..5dd2f3f 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.467400 ;
     DIRECTION INOUT ;
@@ -138,6 +126,22 @@
         RECT 0.085000 0.255000 0.345000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.515000 0.995000 0.685000 1.805000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
index d10a192..781c3ea 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -94,18 +94,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.849000 ;
     DIRECTION INOUT ;
@@ -144,6 +132,22 @@
         RECT 0.525000 1.525000 0.830000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.915000 0.995000 1.220000 1.325000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
index a772bb5..39d0f15 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 7.310000 0.905000 7.675000 1.415000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
index 6a9c948..f3797db 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
@@ -140,6 +128,22 @@
         RECT 1.985000 0.825000 2.155000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.645000 0.255000 0.815000 0.660000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
index 431a5bc..f1efbba 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.325000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.445000 0.905000 2.775000 2.125000 ;
     END
   END Y
+  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.325000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
index 306b7a2..55844ee 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 5.245000 1.615000 5.515000 2.125000 ;
     END
   END Y
+  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.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
index ce97491..7d94d75 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.705000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 0.095000 1.575000 0.425000 2.425000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
index 7196fde..f99f623 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.910000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.645000 2.005000 0.815000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
index 47fb98c..571702e 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 6.585000 0.825000 6.780000 1.785000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
index 6996b46..89e04ca 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.595000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 1.985000 1.495000 2.410000 2.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
index 0e1e564..70630df 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.575000 0.295000 4.955000 0.655000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
index b7bb292..52543c5 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 8.265000 0.255000 8.435000 0.635000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
index 1d759db..d61fcc9 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.975000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 0.090000 1.915000 0.425000 2.425000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
index 10f68bb..7d4bde1 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 1.115000 1.955000 1.285000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
index d649fff..35ade2e 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -121,6 +109,22 @@
         RECT 1.585000 1.665000 1.755000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
index 654c789..0be3ff7 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 0.965000 0.295000 1.265000 0.635000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.235000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
index 9934dab..0a6f6c9 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.195000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.080000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 1.965000 0.825000 2.195000 1.455000 ;
     END
   END Y
+  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.195000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
index 69ef3da..9b12761 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -120,18 +120,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.195000 ;
     DIRECTION INOUT ;
@@ -192,6 +180,22 @@
         RECT 3.335000 1.745000 3.715000 2.085000 ;
     END
   END Y
+  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.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 2.255000  4.105000 2.425000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
index 659d345..99f4562 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.445650 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.860000 0.545000 2.155000 1.915000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
index 1720d99..03f6774 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.819100 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.935000 0.545000 2.205000 1.915000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
index c33ead0..65ac092 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.245000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 3.290000 0.845000 3.570000 1.535000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
index 1b28be1..09d34f1 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 4.475000 0.885000 4.975000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
index d086e55..9a5e931 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.010000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 5.495000 0.885000 5.915000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
index bb135e4..51db0ed 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.642200 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.770000 0.775000 3.080000 1.580000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
index 3a95734..8a6fa42 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.924800 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.755000 0.775000 3.090000 1.580000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
index 476a2a7..6886ec8 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.275700 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.445000 0.825000 2.980000 1.535000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
index 2e8dbbf..e87ac0a 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.454800 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 2.490000 0.735000 2.660000 1.765000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
index 825c24d..737a7fd 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.832500 ;
     DIRECTION INOUT ;
@@ -132,6 +120,22 @@
         RECT 2.260000 1.445000 2.620000 1.795000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.100000 1.425000 2.040000 1.595000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
index 385b9f5..446cb35 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.435000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 4.210000 0.845000 4.490000 1.535000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
index a6bbf44..1c11ff4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.591300 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 3.365000 0.735000 3.535000 1.765000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
index 1ddea58..93952a4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940900 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 3.240000 1.445000 3.590000 1.795000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
index 682d0a9..cd558e5 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.390700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 3.570000 0.845000 3.995000 1.535000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
index 45726f4..421ef8f 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560100 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.825000 0.805000 3.085000 2.205000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
index 41f5ee5..c298a84 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.994300 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.835000 0.805000 3.075000 1.835000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
index 00ee00e..9c14b6a 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.510000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.200000 0.810000 4.455000 1.485000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
index 4527482..848e24b 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.711500 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.725000 0.805000 3.995000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
index 831d6ce..dbd7c9c 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.856300 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.775000 0.825000 4.455000 1.535000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
index 8f02245..90b01e6 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.615700 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
index 7871b48..2ed3f5a 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.677900 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 4.285000 0.825000 4.510000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
index 117aa5c..66300f8 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.299000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 1.065000 1.545000 1.420000 1.715000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
index 3a226d6..7893514 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.981400 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
index 09707be..088df0c 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.244900 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.215000 0.760000 1.395000 1.560000 ;
     END
   END X
+  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 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.165000 1.535000 0.890000 1.705000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
index 7b30821..228507d 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.620000 -0.085000 0.790000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
@@ -156,6 +144,22 @@
         RECT 7.225000 1.615000 7.395000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.620000 -0.085000 0.790000 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
   OBS
     LAYER li1 ;
       RECT 0.515000 1.445000 2.215000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
index 4165bf0..9f9c7be 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.440000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 10.860000 1.615000 11.135000 2.360000 ;
     END
   END X
+  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.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
index 54dffee..c40c7a7 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.709400 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.270000 0.255000 1.695000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
index 68c5a7b..c35ab09 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 2.055000 1.615000 2.225000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.095000 1.485000 0.860000 1.655000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
index d12b2aa..8d3ee15 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -126,6 +114,22 @@
         RECT 3.725000 1.615000 3.895000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.775000 0.255000 1.155000 0.735000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
index d28b2df..ae4bf23 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
@@ -136,6 +124,22 @@
         RECT 4.875000 1.615000 5.045000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.745000 1.615000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
index fcd77a7..8478736 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  4.020000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 12.920000 0.905000 13.220000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
index f8a298d..7348820 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.044400 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 6.860000 0.905000 7.240000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
index 3de14d1..6e2fdb4 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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.610000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.750000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 11.930000 0.905000 12.205000 1.445000 ;
     END
   END Y
+  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.610000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
index 47c654e..70c3057 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 6.415000 0.905000 6.805000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
index fa3e892..31ac081 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -48,12 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.529300 ;
     DIRECTION INOUT ;
@@ -74,6 +68,14 @@
         RECT 0.085000 1.560000 0.355000 2.465000 ;
     END
   END X
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
index 5ac5bbd..3ec4d4a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
@@ -92,6 +80,22 @@
         RECT 7.175000 1.665000 7.445000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
index 3b13052..11ccd41 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.245000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 9.245000 1.720000  9.535000 2.460000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
index e962f0d..0531c3c 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.615000 ;
     DIRECTION INOUT ;
@@ -82,6 +70,22 @@
         RECT 1.485000 0.825000 1.875000 1.855000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
index 8e0bb1b..561de62 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.960000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 2.410000 0.905000 2.910000 1.415000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
index f98968c..76738c4 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 3.745000 0.905000 4.075000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
index ec164e6..98a5a0a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.750000 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 4.450000 1.735000 4.710000 2.460000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
index 877418c..ef1f37d 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.470400 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.515000 1.290000 0.895000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
index e4f458a..aa04bee 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.860000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 8.115000 1.630000 8.385000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
index c99440e..8abe5da 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.895000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 11.375000 1.665000 11.630000 2.450000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
index e93643a..a6ef5e2 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.575000 ;
     DIRECTION INOUT ;
@@ -83,6 +71,22 @@
         RECT 1.520000 0.895000 2.155000 1.460000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
index e758998..b02c1f0 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.270000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 3.270000 0.895000 3.570000 1.460000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
index a9ca538..796c00e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.095000 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 6.060000 0.865000 6.330000 1.460000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
index 5c13234..638ca54 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.650000 ;
     DIRECTION INOUT ;
@@ -79,6 +67,22 @@
         RECT 0.785000 0.750000 1.235000 2.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
index b7b8b3a..f7ffe43 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.790000 ;
     DIRECTION INOUT ;
@@ -82,6 +70,22 @@
         RECT 1.655000 1.295000 1.985000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
index 6c1589b..c9d10e6 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.420000 -0.085000 0.640000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.805800 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
index 1fdda11..b5b0e84 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.880000 -0.085000 1.100000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.066400 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 0.555000 1.495000 0.895000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.880000 -0.085000 1.100000 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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
index 5998e4d..6c7f193 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 1.800000 -0.085000 2.020000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.358800 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 1.475000 1.495000 1.835000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 1.800000 -0.085000 2.020000 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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
index 8286dca..87d9e8f 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -54,18 +54,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -74,6 +62,22 @@
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
index d27a9d7..9e425f0 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  2.601500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
index b902698..812c723 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.324500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
index 40ed3ef..ce9e325 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.577500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
index e82dafa..e217538 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.083500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
index 4a40cdd..085cb29 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.589500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
index 5767883..13700c6 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.314500 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
index f6dad56..17874d3 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.584500 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
index d004118..2ae1a1a 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.881700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
+  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.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
index fb5a2fc..49d2514 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.388300 ;
     DIRECTION INOUT ;
@@ -169,6 +157,22 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000 0.345000 0.635000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
index edd260a..e03c191 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -118,18 +118,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.678900 ;
     DIRECTION INOUT ;
@@ -175,6 +163,22 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000 0.345000 0.635000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
index f2738d7..2a2f233 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -126,18 +126,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.968300 ;
     DIRECTION INOUT ;
@@ -187,6 +175,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000  0.345000 0.635000 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
index 98d44c4..a9c7712 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
@@ -40,26 +40,32 @@
         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 INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         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 INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
index bad0693..b2deafa 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
@@ -40,26 +40,32 @@
         RECT 0.085000 0.255000 1.755000 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 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         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 INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
index 500ed29..932c87e 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
@@ -40,13 +40,25 @@
         RECT 0.085000 0.255000 2.675000 2.465000 ;
     END
   END DIODE
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        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 0.650000 2.070000 ;
@@ -54,14 +66,8 @@
         RECT  2.110000 1.305000 2.950000 2.070000 ;
     END
   END VPB
-  PIN VGND
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
index 9e0a91e..f5b6d5e 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
@@ -40,13 +40,25 @@
         RECT 0.085000 0.255000 3.595000 2.465000 ;
     END
   END DIODE
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        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 0.650000 2.070000 ;
@@ -54,14 +66,8 @@
         RECT  3.030000 1.305000 3.870000 2.070000 ;
     END
   END VPB
-  PIN VGND
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
index 9b5afcc..7425f6e 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
index 5948846..4faa579 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
index 0bdbfed..0da04d7 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
index ec0a532..f680843 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
index 5a34032..d064965 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
index d710b8f..2c6c5ea 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
index 04a7dc4..95898aa 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.784600 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
index 6a8d75c..f8785e8 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.044600 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
index 44dc6a2..86e2d8a 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.349600 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
index 9d1b935..5ba95d3 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 2.950000 0.825000 3.120000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
index 7cad248..681a101 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 2.860000 0.825000 3.110000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
index 2ede95d..87c2176 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.449100 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 3.325000 0.825000 3.595000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
index e19b63e..bdd6555 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.465600 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 3.315000 0.825000 3.585000 1.495000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT -0.005000  2.635000 3.680000 2.805000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
index 01c58e2..c6a8e90 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.525400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 4.230000 0.855000 4.460000 1.445000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
index 5b4ee2a..a87875a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940200 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 6.105000 0.855000 6.335000 1.445000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
index f9ab309..322e190 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -59,18 +59,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.958400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 10.675000 0.855000 10.925000 1.445000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
index 263427f..f4bd440 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.314400 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.970000 0.595000 2.210000 1.785000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
index bea1a18..340621f 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.552600 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 3.035000 1.695000 3.535000 2.465000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
index d6c1a9c..d1f0e43 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.866300 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 4.430000 1.480000 4.810000 2.075000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
index 23610f3..8718617 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411500 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 8.870000 0.825000 9.095000 1.455000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
index 39fe8f5..435e597 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.845700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.980000 2.125000 2.625000 2.465000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
index f7d7ee4..be4a721 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.445400 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.645000 0.595000 3.075000 2.125000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
index dae946e..cdfd600 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.815200 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 4.430000 1.615000 4.810000 2.125000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
index d96c80d..d5c92fb 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.360400 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 8.190000 1.615000 8.570000 2.125000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
index c84257b..47f8a86 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.460000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
index 3c09c4a..e12ca44 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 0.920000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.920000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
index 3f77c1b..b42d8f2 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
index 1d8bd82..2b1c602 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
index 64d33a1..f76f971 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.469100 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.955000 0.545000 2.205000 1.915000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
index 6ed5e26..8c774e0 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.905000 0.775000 3.080000 1.580000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
index 58a46f0..cb23378 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.910000 0.760000 3.080000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
index 94b26fc..5a702b5 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.900000 0.825000 2.215000 1.845000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
index 3294568..6dd9aba 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.995000 0.885000 1.285000 1.485000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
index f3fc1e6..2864209 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.000000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 5.970000 0.905000 6.320000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
index 6547350..9f5cefd 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 7.160000 1.665000 7.540000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
index fd4635e..b693b14 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.605000 0.885000 0.905000 1.485000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
index 0a93286..8135792 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.075000 ;
     DIRECTION INOUT ;
@@ -85,6 +73,22 @@
         RECT 2.395000 0.905000 2.665000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
index 00d38fc..23ace15 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.130000 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.865000 0.905000 3.265000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
index c3aa002..06048b0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 4.185000 0.905000 4.505000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
index 3de3e96..d89d594 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.328800 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.025000 0.815000 2.205000 1.850000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
index d69ae46..100263f 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
-  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 18.590000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.270000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 17.770000 0.905000 18.305000 1.455000 ;
     END
   END X
+  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 18.590000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
index 3e75921..117fea0 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.525000 0.895000 1.815000 2.125000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
index e079d84..34418d9 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
index ae94da4..94ca771 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 9.050000 0.905000 9.565000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
index f9dfeda..5da410a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.420000 -0.085000 0.640000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.492600 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index 50989ce..0891cd3 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
-  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 16.750000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.690000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 15.285000 1.665000 15.615000 2.465000 ;
     END
   END X
+  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 16.750000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 2b1a7ff..5ec9ce4 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
-  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 18.590000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.270000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 17.165000 1.665000 17.495000 2.465000 ;
     END
   END X
+  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 18.590000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 3ad64a8..f1709a4 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.776400 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.515000 1.595000 0.875000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index d75938d..2efb131 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.195000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 5.650000 0.805000 5.880000 1.575000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index b51f2c2..a609112 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.160000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 3.465000 1.745000 3.635000 2.465000 ;
     END
   END X
+  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.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 2360c53..b4b2563 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.820000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.605000 1.455000 0.890000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index 90bc3e2..4295963 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 5.255000 0.465000 5.425000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index bae74a2..f1bd124 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.475000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.095000 2.255000 4.185000 2.425000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
index 1ef0601..13aa0de 100644
--- a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
+++ b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
@@ -4590,6 +4590,86 @@
       RECT 224.525000  2.295000 224.815000 2.340000 ;
       RECT 224.525000  3.100000 224.815000 3.145000 ;
       RECT 224.525000  3.285000 224.815000 3.330000 ;
+    LAYER nwell ;
+      RECT  -0.190000 1.305000 225.590000 2.910000 ;
+      RECT 105.610000 2.910000 225.590000 4.135000 ;
+    LAYER pwell ;
+      RECT   0.420000 -0.085000   0.640000 0.085000 ;
+      RECT   5.480000 -0.085000   5.700000 0.085000 ;
+      RECT  11.460000 -0.085000  11.680000 0.085000 ;
+      RECT  15.785000 -0.085000  15.955000 0.085000 ;
+      RECT  24.525000 -0.085000  24.695000 0.085000 ;
+      RECT  30.505000 -0.085000  30.675000 0.085000 ;
+      RECT  30.965000 -0.085000  31.135000 0.085000 ;
+      RECT  36.945000 -0.085000  37.115000 0.085000 ;
+      RECT  37.405000 -0.085000  37.575000 0.085000 ;
+      RECT  49.825000 -0.085000  49.995000 0.085000 ;
+      RECT  50.285000 -0.085000  50.455000 0.085000 ;
+      RECT  62.705000 -0.085000  62.875000 0.085000 ;
+      RECT  63.165000 -0.085000  63.335000 0.085000 ;
+      RECT  67.305000 -0.085000  67.475000 0.085000 ;
+      RECT  71.445000 -0.085000  71.615000 0.085000 ;
+      RECT  75.585000 -0.085000  75.755000 0.085000 ;
+      RECT  79.725000 -0.085000  79.895000 0.085000 ;
+      RECT  80.185000 -0.085000  80.355000 0.085000 ;
+      RECT  86.165000 -0.085000  86.335000 0.085000 ;
+      RECT  86.625000 -0.085000  86.795000 0.085000 ;
+      RECT  92.605000 -0.085000  92.775000 0.085000 ;
+      RECT  93.065000 -0.085000  93.235000 0.085000 ;
+      RECT  99.045000 -0.085000  99.215000 0.085000 ;
+      RECT  99.505000 -0.085000  99.675000 0.085000 ;
+      RECT 105.485000 -0.085000 105.655000 0.085000 ;
+      RECT 105.945000 -0.085000 106.115000 0.085000 ;
+      RECT 111.925000 -0.085000 112.095000 0.085000 ;
+      RECT 124.345000 -0.085000 124.515000 0.085000 ;
+      RECT 130.785000 -0.085000 130.955000 0.085000 ;
+      RECT 134.925000 -0.085000 135.095000 0.085000 ;
+      RECT 139.065000 -0.085000 139.235000 0.085000 ;
+      RECT 143.205000 -0.085000 143.375000 0.085000 ;
+      RECT 147.345000 -0.085000 147.515000 0.085000 ;
+      RECT 147.805000 -0.085000 147.975000 0.085000 ;
+      RECT 153.785000 -0.085000 153.955000 0.085000 ;
+      RECT 154.245000 -0.085000 154.415000 0.085000 ;
+      RECT 160.225000 -0.085000 160.395000 0.085000 ;
+      RECT 160.685000 -0.085000 160.855000 0.085000 ;
+      RECT 166.665000 -0.085000 166.835000 0.085000 ;
+      RECT 167.125000 -0.085000 167.295000 0.085000 ;
+      RECT 173.105000 -0.085000 173.275000 0.085000 ;
+      RECT 173.565000 -0.085000 173.735000 0.085000 ;
+      RECT 185.985000 -0.085000 186.155000 0.085000 ;
+      RECT 186.445000 -0.085000 186.615000 0.085000 ;
+      RECT 198.865000 -0.085000 199.035000 0.085000 ;
+      RECT 199.325000  0.320000 199.495000 0.845000 ;
+      RECT 199.785000 -0.085000 199.955000 0.085000 ;
+      RECT 212.205000 -0.085000 212.375000 0.085000 ;
+      RECT 212.665000 -0.085000 212.835000 0.085000 ;
+      RECT 225.085000 -0.085000 225.255000 0.085000 ;
+    LAYER pwell ;
+      RECT 105.945000 5.355000 106.115000 5.525000 ;
+      RECT 111.925000 5.355000 112.095000 5.525000 ;
+      RECT 124.345000 5.355000 124.515000 5.525000 ;
+      RECT 130.785000 5.355000 130.955000 5.525000 ;
+      RECT 134.925000 5.355000 135.095000 5.525000 ;
+      RECT 139.065000 5.355000 139.235000 5.525000 ;
+      RECT 143.205000 5.355000 143.375000 5.525000 ;
+      RECT 147.345000 5.355000 147.515000 5.525000 ;
+      RECT 147.805000 5.355000 147.975000 5.525000 ;
+      RECT 153.785000 5.355000 153.955000 5.525000 ;
+      RECT 154.245000 5.355000 154.415000 5.525000 ;
+      RECT 160.225000 5.355000 160.395000 5.525000 ;
+      RECT 160.685000 5.355000 160.855000 5.525000 ;
+      RECT 166.665000 5.355000 166.835000 5.525000 ;
+      RECT 167.125000 5.355000 167.295000 5.525000 ;
+      RECT 173.105000 5.355000 173.275000 5.525000 ;
+      RECT 173.565000 5.355000 173.735000 5.525000 ;
+      RECT 185.985000 5.355000 186.155000 5.525000 ;
+      RECT 186.445000 5.355000 186.615000 5.525000 ;
+      RECT 198.865000 5.355000 199.035000 5.525000 ;
+      RECT 199.325000 4.595000 199.495000 5.120000 ;
+      RECT 199.785000 5.355000 199.955000 5.525000 ;
+      RECT 212.205000 5.355000 212.375000 5.525000 ;
+      RECT 212.665000 5.355000 212.835000 5.525000 ;
+      RECT 225.085000 5.355000 225.255000 5.525000 ;
   END
 END sky130_fd_sc_hdll__muxb
 END LIBRARY
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index 1bd5143..f842bea 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -465,54 +465,6 @@
         RECT 0.000000 5.200000 17.020000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 5.355000 16.875000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 5.355000 8.595000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 17.210000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  6.380000 ;
     DIRECTION INOUT ;
@@ -764,6 +716,58 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 5.355000 16.875000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 5.355000 4.455000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 5.355000 8.595000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index 5d224b8..e878f2c 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -477,78 +477,6 @@
         RECT 0.000000 5.200000 25.760000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 5.355000 19.175000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 5.355000 19.635000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  7.520000 ;
     DIRECTION INOUT ;
@@ -694,6 +622,82 @@
         RECT 24.005000 3.640000 24.295000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 5.355000 19.175000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 5.355000 19.635000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 5.355000 6.755000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 5873c65..a1c23fb 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -647,92 +647,6 @@
         RECT 0.000000 5.200000 51.980000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 0.265000 26.135000 0.810000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 4.630000 26.135000 5.175000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 -0.085000 26.535000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 5.355000 26.535000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 -0.085000 38.955000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 5.355000 38.955000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 -0.085000 39.415000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 5.355000 39.415000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 -0.085000 51.835000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 5.355000 51.835000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 1.470000 26.135000 2.455000 ;
-        RECT 25.845000 2.985000 26.135000 3.970000 ;
-    END
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 52.170000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  20.364799 ;
     DIRECTION INOUT ;
@@ -956,6 +870,97 @@
         RECT 48.705000 3.640000 48.995000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 0.265000 26.135000 0.810000 ;
+      LAYER pwell ;
+        RECT 25.905000 0.320000 26.075000 0.845000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 4.630000 26.135000 5.175000 ;
+      LAYER pwell ;
+        RECT 25.905000 4.595000 26.075000 5.120000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 -0.085000 26.535000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 5.355000 26.535000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 -0.085000 38.955000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 5.355000 38.955000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 -0.085000 39.415000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 5.355000 39.415000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 -0.085000 51.835000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 5.355000 51.835000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 1.470000 26.135000 2.455000 ;
+        RECT 25.845000 2.985000 26.135000 3.970000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 52.170000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index 5bb972d..cffd133 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -119,18 +119,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.690000 ;
     DIRECTION INOUT ;
@@ -157,6 +145,22 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index 43f78ad..bd9732e 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -150,30 +150,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.070000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880000 ;
     DIRECTION INOUT ;
@@ -243,6 +219,34 @@
         RECT 11.125000 1.940000 11.415000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 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
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index fa61570..3f3ee31 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -192,30 +192,6 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  5.091200 ;
     DIRECTION INOUT ;
@@ -331,6 +307,34 @@
         RECT 22.485000 1.940000 22.775000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index f045a3f..bfebf2e 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -250,34 +250,6 @@
         RECT 0.000000 -0.240000 17.020000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 17.210000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.190000 ;
     DIRECTION INOUT ;
@@ -451,6 +423,38 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index 8c1af27..199f707 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -256,46 +256,6 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.760000 ;
     DIRECTION INOUT ;
@@ -411,6 +371,50 @@
         RECT 24.005000 1.940000 24.295000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index 3b2de72..00f44a5 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -341,38 +341,6 @@
         RECT 0.000000 5.200000 24.840000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 -0.085000 18.715000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 5.355000 18.715000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.030000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  9.422400 ;
     DIRECTION INOUT ;
@@ -494,6 +462,42 @@
         RECT 22.325000 3.640000 22.615000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 -0.085000 18.715000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 5.355000 18.715000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.030000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 2.635000  2.035000 2.805000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index 1e7599e..5d8fb50 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 0.650000 0.885000 0.820000 1.485000 ;
     END
   END Y
+  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.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index 68415a4..1af0a07 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.730000 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 10.965000 1.325000 11.235000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index 38ea4d3..e47b813 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.890000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 14.725000 1.325000 14.995000 1.495000 ;
     END
   END Y
+  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.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index c68e199..aa31d90 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.830000 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.950000 0.905000 2.230000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 61a396a..43b2275 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 3.335000 1.665000 3.715000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index 38a5bea..a2efc9b 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 5.325000 1.325000 5.595000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index 89e5e25..6e86282 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.690000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 7.225000 0.905000 7.475000 1.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index 446f058..142b875 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.575700 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.820000 0.545000 2.190000 1.835000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index ca8c80f..fbf91d0 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.062800 ;
     DIRECTION INOUT ;
@@ -92,6 +80,22 @@
         RECT 2.340000 1.495000 2.615000 1.835000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index e006fb9..12eadbc 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.825000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 4.340000 1.665000 4.720000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index 0d18eed..6a0d684 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 1.515000 1.665000 1.895000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index 58af2ed..4921d4d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.915000 1.665000 3.295000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index 6e4bacd..a2e7e5f 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.250000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 6.555000 0.905000 6.785000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index 379689d..8e460fe 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.605700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.410000 0.485000 2.675000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index 59d7177..5ffc550 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.465700 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 4.250000 0.905000 4.490000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index a5b3159..cb29503 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 6.725000 1.665000 7.105000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index ea003f4..3d129d8 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 1.775000 0.825000 1.945000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index 8c25fae..674c47e 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.180000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 3.945000 1.665000 4.325000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index 205abc7..975300a 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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.925000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.150000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 7.675000 1.665000 8.055000 2.465000 ;
     END
   END Y
+  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.925000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index c720120..4d268d8 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.015700 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.875000 0.835000 3.135000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index 2f514de..7941c66 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.223400 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 4.885000 1.665000 5.265000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index 44e20a6..7b3100e 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.360000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 8.605000 1.665000 8.985000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index b7ed3c6..88fe2c2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.132500 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.410000 0.825000 2.680000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index d5e1b2c..ef100f2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.021800 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 5.495000 1.665000 5.875000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index 437ae02..883e6c8 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.425000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 9.485000 1.665000 9.865000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index c8a5535..c089103 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 0.605000 0.895000 0.775000 1.495000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index 9071599..5246d2f 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 2.095000 0.905000 2.310000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index a7ca4eb..669a4ec 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 4.095000 0.905000 4.490000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index 2184894..0590f76 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 7.460000 0.905000 8.025000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 1c43516..4ff97de 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.366600 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.035000 0.895000 2.215000 1.850000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index 5f94fe2..cd3210b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.565000 0.895000 1.815000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index 56d073f..4a6e597 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index ee4667e..2e2deca 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.245000 0.825000 1.415000 2.280000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index 8e2d559..9d516eb 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 3.480000 0.905000 3.995000 1.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index d591bb3..70f8d3c 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 6.055000 0.905000 6.345000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index e531e94..b857a0f 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.375000 0.310000 1.545000 0.655000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 960d8a6..bd4c45d 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.935000 0.255000 3.355000 0.725000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index ab78ee9..ca91506 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 6.905000 0.905000 7.245000 1.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index edf473b..795a667 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 1.595000 0.385000 1.765000 0.655000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index ff78e2a..f9cd5d3 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.615000 0.905000 4.950000 1.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 87db99d..6bddaa6 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 8.360000 0.905000 8.630000 1.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index e9f0178..3168c00 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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.610000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -122,6 +110,22 @@
         RECT 11.445000 1.625000 11.835000 2.125000 ;
     END
   END Y
+  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.610000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index 896462c..27a8b6b 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 16.100000 0.240000 ;
     END
   END VGND
-  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 16.290000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -127,6 +115,22 @@
         RECT 15.225000 1.625000 15.475000 2.125000 ;
     END
   END Y
+  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 16.290000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.100000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index 127b727..8177d2e 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.479900 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 1.875000 0.310000 2.075000 0.655000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index d9df8dd..f869a2b 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 4.065000 1.075000 4.490000 1.455000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index 8090173..11135bd 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 7.705000 1.625000 7.955000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index 3559ae8..12fec98 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.523625 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.140000 0.310000 3.340000 0.655000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index 21b21d3..478b78e 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.543625 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 5.455000 0.255000 5.835000 0.725000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index eaee033..28bd6df 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 9.135000 0.255000 9.515000 0.725000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index 0a7c80d..fa979cf 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.070000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 0.085000 1.495000 0.425000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index 5b10202..a4c5952 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.120000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.765000 0.785000 4.035000 1.905000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index cfa312f..47321c3 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.795000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 2.040000 1.700000 2.230000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index 4c9a1bf..788a887 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 2.440000 0.825000 2.675000 1.815000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index 644f770..c4fe57b 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.150000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 3.025000 1.710000 3.405000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 4ef454b..ae144a6 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.480000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 7.980000 1.340000 8.480000 1.855000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index 7caca97..db17995 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.255000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.030000 0.365000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 5a47fab..fc2e330 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.365000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.530000 0.255000 0.825000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index c04bf19..dd4c510 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 1.975000 1.700000 2.155000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 26d1f92..f12811c 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.651500 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.645000 0.275000 2.110000 0.955000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index 753134d..103eb2e 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.995000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 2.695000 1.965000 3.110000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index ca75d28..1806c4b 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 5.920000 0.845000 6.330000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index b159a37..d0818da 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.925700 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.480000 0.425000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index 5e0bc1e..c046501 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.380700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 0.995000 1.495000 1.455000 1.695000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index c0b5fe7..3ba5350 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 2.045000 0.255000 2.375000 0.725000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index e165a97..60967a5 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.660700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 1.635000 1.625000 2.155000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index c5f0af3..6302632 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.865700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.655000 1.615000 2.900000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index 329d802..5979203 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 4.515000 1.625000 4.765000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index 369c48c..ed75f7c 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 3.715000 0.825000 4.030000 1.875000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index c246876..3fd44e3 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 4.180000 0.905000 4.490000 1.875000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index 062612c..df9aadb 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.220000 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 7.365000 0.905000 7.710000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index da3ba42..0d8e818 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -87,18 +87,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.240000 ;
     DIRECTION INOUT ;
@@ -123,6 +111,22 @@
         RECT 1.900000 2.180000 2.505000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index ee0fce1..6ae8af9 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.745000 ;
     DIRECTION INOUT ;
@@ -125,6 +113,22 @@
         RECT 4.500000 1.955000 4.750000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index fae47fb..ebadcef 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -90,18 +90,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.645000 ;
     DIRECTION INOUT ;
@@ -127,6 +115,22 @@
         RECT 4.345000 1.785000 8.565000 2.005000 ;
     END
   END Y
+  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.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index 2025be2..a549b9b 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.980000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.085000 0.365000 0.365000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index 2aed76a..da233c5 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 4.330000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.380000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.605000 0.365000 0.855000 2.465000 ;
     END
   END X
+  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 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index 32ec55e..eef5e5e 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.055000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index fb2f74d..df5fd34 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.550000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 1.130000 2.045000 1.680000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index a5ddf68..dab5257 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.065000 1.625000 3.315000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index 702184a..78e3217 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
@@ -120,6 +108,22 @@
         RECT 7.905000 0.820000 8.170000 1.785000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index 38d9f87..33ac18e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.839800 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.085000 1.795000 0.345000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index b3eaaaa..05cf3a2 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.255800 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 0.535000 1.795000 0.840000 2.465000 ;
     END
   END X
+  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.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index 8f18a4e..0915129 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.510000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 7.405000 0.905000 7.710000 1.415000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index b7026ed..c60a143 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.275000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 1.950000 1.665000 2.275000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 331d6b9..5bfcc78 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.960000 ;
     DIRECTION INOUT ;
@@ -113,6 +101,22 @@
         RECT 4.430000 1.955000 4.680000 2.125000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index 9e96437..01e00d8 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 11.230000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.080000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 8.215000 1.625000 8.465000 2.125000 ;
     END
   END Y
+  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 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index a92462a..597f20a 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 1.885000 0.825000 2.155000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT -0.015000  2.635000 2.760000 2.805000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index 4edf7bc..41f9902 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 4.625000 1.665000 4.965000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index 27329ee..745d014 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 8.300000 1.695000 8.625000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index 32c078b..12681a2 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 0.530000 1.785000 1.530000 2.465000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index 2198333..f87cce2 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 3.025000 1.665000 3.405000 2.085000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index cd858bb..6293a45 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -120,6 +108,22 @@
         RECT 5.750000 1.665000 6.130000 2.085000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index aac7ef5..62de706 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.915000 0.825000 2.215000 1.845000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index 8c9af00..84e63a9 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.595700 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.935000 0.825000 2.415000 1.835000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index a8a8ca7..ebc9d1f 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.955000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 2.825000 0.905000 3.170000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 60d3264..c94255c 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 5.015000 0.905000 5.415000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index 164df76..eb075a6 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.710000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 5.935000 0.905000 6.335000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index 74bcbd2..95ea154 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.705000 0.760000 3.090000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index 4269ae5..5b68d69 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.719100 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.790000 0.415000 3.110000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index a3cfd58..39086f2 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.068400 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 4.105000 0.905000 4.490000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index 09b599b..fa93df2 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.445000 0.760000 2.615000 1.495000 ;
     END
   END X
+  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.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index 59f5ab5..4a4c4c4 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.825700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.470000 0.760000 2.655000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index b5c080f..85a8a62 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 4.115000 0.905000 4.455000 1.445000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index adb4414..2d6fdef 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 3.215000 0.760000 3.535000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index ca3f206..9ff461b 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.616400 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.985000 1.495000 1.430000 1.700000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index 109bc07..b9f8327 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.885700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.005000 0.255000 2.240000 0.735000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index 4aa5183..4bb4fe1 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.905000 0.760000 3.075000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index 9e5763b..cd965fb 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.625700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.890000 0.760000 3.125000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index a98c769..3b4a1ff 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 4.210000 0.905000 4.485000 1.455000 ;
     END
   END X
+  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.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index 14db3aa..a81568e 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.725000 0.760000 3.995000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index cf251e3..d623d07 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.722700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 1.020000 1.495000 1.350000 1.825000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index ad328d8..7f3f1e0 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.073400 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 5.175000 0.905000 5.415000 1.455000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index e853f15..752766b 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.564325 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 4.235000 0.760000 4.455000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index 697fcc9..8da1ef5 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.859325 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 4.260000 0.760000 4.455000 1.495000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index edc5d7c..e912f09 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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.285000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.203625 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 5.625000 0.905000 5.855000 1.455000 ;
     END
   END X
+  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.285000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index 021df61..fed846f 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
@@ -125,6 +113,22 @@
         RECT 1.250000 1.950000 4.270000 2.160000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index 1d9fd56..ac8ed27 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -54,18 +54,6 @@
         RECT 4.560000 -0.455000 6.675000 -0.155000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
@@ -89,6 +77,22 @@
         RECT -1.260000 0.560000 1.060000 2.160000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index a28a915..3a118ea 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -170,18 +170,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.152000 ;
     DIRECTION INOUT ;
@@ -238,6 +226,22 @@
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
+  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.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.170000 0.345000  0.345000 0.635000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index 33c9489..3e83c66 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -109,20 +109,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.450000 2.910000 ;
-        RECT  4.455000 1.305000 14.450000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880750 ;
     DIRECTION INOUT ;
@@ -132,6 +118,24 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index c9a9e89..8250391 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -109,20 +109,6 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.910000 2.910000 ;
-        RECT  4.455000 1.305000 14.910000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.269200 ;
     DIRECTION INOUT ;
@@ -132,6 +118,24 @@
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.910000 2.910000 ;
+        RECT  4.455000 1.305000 14.910000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.720000 0.085000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index b380d99..db16077 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.455000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 63c0b2c..876e475 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.455000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 97f9d11..dc54d7c 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.530000 2.910000 ;
-        RECT  4.455000 1.305000 13.530000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.059800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.530000 2.910000 ;
+        RECT  4.455000 1.305000 13.530000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index 31b7375..7482b87 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -103,20 +103,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.450000 2.910000 ;
-        RECT  4.455000 1.305000 14.450000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.264800 ;
     DIRECTION INOUT ;
@@ -126,6 +112,24 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  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  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index 266a19e..a628d85 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
-  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 14.910000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.970500 ;
     DIRECTION INOUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
+  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 14.910000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.720000 0.085000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index 3574b08..a6ecaca 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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 15.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.625500 ;
     DIRECTION INOUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
+  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 15.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index d17d3e7..01d07cf 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -101,18 +101,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.599700 ;
     DIRECTION INOUT ;
@@ -122,6 +110,22 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index 5cfb0a6..472632f 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -103,18 +103,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.071800 ;
     DIRECTION INOUT ;
@@ -124,6 +112,22 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index e94ca6f..9d463b7 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -107,18 +107,6 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.397400 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.180000 0.085000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index 4fe065b..a8102f5 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -97,18 +97,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.705550 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index b84b0e0..906075e 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -95,18 +95,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.675550 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index 284057a..e4fdec1 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -88,18 +88,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.369900 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 1c5bd00..fc48a02 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -88,18 +88,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.711150 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 9ccf4b5..4dd5b49 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.981150 ;
     DIRECTION INOUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index 2f6c51a..33aaa6b 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.382600 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 9b5b7a6..a4a4040 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.665400 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index a8a7cf3..681ebf5 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.223500 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index e679662..9edc542 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -103,20 +103,6 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
-  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.285000 1.435000 ;
-        RECT -0.190000 1.435000 15.370000 2.910000 ;
-        RECT  7.985000 1.305000 15.370000 1.435000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.935350 ;
     DIRECTION INOUT ;
@@ -126,6 +112,24 @@
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
+  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.285000 1.435000 ;
+        RECT -0.190000 1.435000 15.370000 2.910000 ;
+        RECT  7.985000 1.305000 15.370000 1.435000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.180000 0.085000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 97c9e35..1ec1486 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -105,20 +105,6 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
-  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.285000 1.435000 ;
-        RECT -0.190000 1.435000 16.750000 2.910000 ;
-        RECT  7.985000 1.305000 16.750000 1.435000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.495350 ;
     DIRECTION INOUT ;
@@ -128,6 +114,24 @@
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
+  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.285000 1.435000 ;
+        RECT -0.190000 1.435000 16.750000 2.910000 ;
+        RECT  7.985000 1.305000 16.750000 1.435000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
index 594a713..9dd5fdf 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
@@ -30,6 +30,338 @@
         RECT 177.780000 4.880000 180.095000 5.595000 ;
         RECT 177.780000 5.895000 180.095000 6.610000 ;
         RECT 177.980000 5.595000 180.095000 5.895000 ;
+      LAYER pwell ;
+        RECT    3.825000 0.320000    3.995000 0.845000 ;
+        RECT    7.045000 4.595000    7.215000 5.120000 ;
+        RECT    8.425000 0.320000    8.595000 0.845000 ;
+        RECT   15.325000 4.595000   15.495000 5.120000 ;
+        RECT   16.245000 0.320000   16.415000 0.845000 ;
+        RECT   19.465000 0.320000   19.635000 0.845000 ;
+        RECT   21.305000 4.595000   21.475000 5.120000 ;
+        RECT   24.985000 0.320000   25.155000 0.845000 ;
+        RECT   28.205000 4.595000   28.375000 5.120000 ;
+        RECT   33.265000 4.595000   33.435000 5.120000 ;
+        RECT   33.725000 0.320000   33.895000 0.845000 ;
+        RECT   38.325000 0.320000   38.495000 0.845000 ;
+        RECT   42.005000 4.595000   42.175000 5.120000 ;
+        RECT   42.925000 0.320000   43.095000 0.845000 ;
+        RECT   49.825000 0.320000   49.995000 0.845000 ;
+        RECT   51.665000 4.595000   51.835000 5.120000 ;
+        RECT   53.505000 0.320000   53.675000 0.845000 ;
+        RECT   58.565000 0.320000   58.735000 0.845000 ;
+        RECT   66.385000 0.320000   66.555000 0.845000 ;
+        RECT   68.685000 4.595000   68.855000 5.120000 ;
+        RECT   70.065000 0.320000   70.235000 0.845000 ;
+        RECT   74.205000 0.320000   74.375000 0.845000 ;
+        RECT   80.645000 0.320000   80.815000 0.845000 ;
+        RECT   83.405000 0.320000   83.575000 0.845000 ;
+        RECT   87.545000 0.320000   87.715000 0.845000 ;
+        RECT   87.545000 4.595000   87.715000 5.120000 ;
+        RECT   94.445000 0.320000   94.615000 0.845000 ;
+        RECT   94.445000 4.595000   94.615000 5.120000 ;
+        RECT   98.585000 0.320000   98.755000 0.845000 ;
+        RECT  105.025000 0.320000  105.195000 0.845000 ;
+        RECT  106.865000 4.595000  107.035000 5.120000 ;
+        RECT  116.065000 0.320000  116.235000 0.845000 ;
+        RECT  120.665000 0.320000  120.835000 0.845000 ;
+        RECT  122.965000 4.595000  123.135000 5.120000 ;
+        RECT  124.805000 0.320000  124.975000 0.845000 ;
+        RECT  129.405000 0.320000  129.575000 0.845000 ;
+        RECT  135.845000 4.595000  136.015000 5.120000 ;
+        RECT  136.765000 0.320000  136.935000 0.845000 ;
+        RECT  140.445000 0.320000  140.615000 0.845000 ;
+        RECT  145.965000 0.320000  146.135000 0.845000 ;
+        RECT  152.405000 4.595000  152.575000 5.120000 ;
+        RECT  155.165000 0.320000  155.335000 0.845000 ;
+        RECT  158.845000 4.595000  159.015000 5.120000 ;
+        RECT  159.765000 0.320000  159.935000 0.845000 ;
+        RECT  164.825000 0.320000  164.995000 0.845000 ;
+        RECT  166.205000 4.595000  166.375000 5.120000 ;
+        RECT  166.665000 4.595000  166.835000 5.120000 ;
+        RECT  173.105000 0.320000  173.275000 0.845000 ;
+        RECT  173.105000 4.595000  173.275000 5.120000 ;
+        RECT  177.245000 0.320000  177.415000 0.845000 ;
+        RECT  179.545000 4.595000  179.715000 5.120000 ;
+        RECT  183.685000 0.320000  183.855000 0.845000 ;
+        RECT  186.445000 4.595000  186.615000 5.120000 ;
+        RECT  193.345000 4.595000  193.515000 5.120000 ;
+        RECT  194.725000 0.320000  194.895000 0.845000 ;
+        RECT  198.405000 0.320000  198.575000 0.845000 ;
+        RECT  200.705000 4.595000  200.875000 5.120000 ;
+        RECT  202.545000 0.320000  202.715000 0.845000 ;
+        RECT  208.065000 4.595000  208.235000 5.120000 ;
+        RECT  209.905000 0.320000  210.075000 0.845000 ;
+        RECT  213.125000 0.320000  213.295000 0.845000 ;
+        RECT  216.345000 4.595000  216.515000 5.120000 ;
+        RECT  218.645000 0.320000  218.815000 0.845000 ;
+        RECT  224.625000 4.595000  224.795000 5.120000 ;
+        RECT  227.845000 0.320000  228.015000 0.845000 ;
+        RECT  232.445000 0.320000  232.615000 0.845000 ;
+        RECT  234.285000 4.595000  234.455000 5.120000 ;
+        RECT  237.505000 0.320000  237.675000 0.845000 ;
+        RECT  246.245000 0.320000  246.415000 0.845000 ;
+        RECT  249.925000 0.320000  250.095000 0.845000 ;
+        RECT  256.825000 0.320000  256.995000 0.845000 ;
+        RECT  268.785000 0.320000  268.955000 0.845000 ;
+        RECT  271.545000 0.320000  271.715000 0.845000 ;
+        RECT  274.765000 0.320000  274.935000 0.845000 ;
+        RECT  278.905000 0.320000  279.075000 0.845000 ;
+        RECT  282.585000 0.320000  282.755000 0.845000 ;
+        RECT  286.725000 0.320000  286.895000 0.845000 ;
+        RECT  291.325000 0.320000  291.495000 0.845000 ;
+        RECT  294.545000 0.320000  294.715000 0.845000 ;
+        RECT  298.225000 0.320000  298.395000 0.845000 ;
+        RECT  303.285000 0.320000  303.455000 0.845000 ;
+        RECT  307.425000 0.320000  307.595000 0.845000 ;
+        RECT  312.025000 0.320000  312.195000 0.845000 ;
+        RECT  317.545000 0.320000  317.715000 0.845000 ;
+        RECT  321.225000 0.320000  321.395000 0.845000 ;
+        RECT  325.365000 0.320000  325.535000 0.845000 ;
+        RECT  330.425000 0.320000  330.595000 0.845000 ;
+        RECT  335.025000 0.320000  335.195000 0.845000 ;
+        RECT  340.085000 0.320000  340.255000 0.845000 ;
+        RECT  345.605000 0.320000  345.775000 0.845000 ;
+        RECT  350.665000 0.320000  350.835000 0.845000 ;
+        RECT  356.185000 0.320000  356.355000 0.845000 ;
+        RECT  363.085000 0.320000  363.255000 0.845000 ;
+        RECT  365.385000 0.320000  365.555000 0.845000 ;
+        RECT  374.125000 0.320000  374.295000 0.845000 ;
+        RECT  386.085000 0.320000  386.255000 0.845000 ;
+        RECT  388.845000 0.320000  389.015000 0.845000 ;
+        RECT  392.525000 0.320000  392.695000 0.845000 ;
+        RECT  397.585000 0.320000  397.755000 0.845000 ;
+        RECT  404.025000 0.320000  404.195000 0.845000 ;
+        RECT  417.825000 0.320000  417.995000 0.845000 ;
+        RECT  425.645000 0.320000  425.815000 0.845000 ;
+        RECT  438.525000 0.320000  438.695000 0.845000 ;
+        RECT  445.885000 0.320000  446.055000 0.845000 ;
+        RECT  448.185000 0.320000  448.355000 0.845000 ;
+        RECT  458.765000 0.320000  458.935000 0.845000 ;
+        RECT  461.525000 0.320000  461.695000 0.845000 ;
+        RECT  465.205000 0.320000  465.375000 0.845000 ;
+        RECT  471.185000 0.320000  471.355000 0.845000 ;
+        RECT  473.485000 0.320000  473.655000 0.845000 ;
+        RECT  486.365000 0.320000  486.535000 0.845000 ;
+        RECT  489.125000 0.320000  489.295000 0.845000 ;
+        RECT  493.265000 0.320000  493.435000 0.845000 ;
+        RECT  500.165000 0.320000  500.335000 0.845000 ;
+        RECT  502.465000 0.320000  502.635000 0.845000 ;
+        RECT  505.685000 0.320000  505.855000 0.845000 ;
+        RECT  507.525000 0.320000  507.695000 0.845000 ;
+        RECT  517.645000 0.320000  517.815000 0.845000 ;
+        RECT  528.225000 0.320000  528.395000 0.845000 ;
+        RECT  540.185000 0.320000  540.355000 0.845000 ;
+        RECT  550.765000 0.320000  550.935000 0.845000 ;
+        RECT  561.805000 0.320000  561.975000 0.845000 ;
+        RECT  574.225000 0.320000  574.395000 0.845000 ;
+        RECT  580.665000 0.320000  580.835000 0.845000 ;
+        RECT  587.565000 0.320000  587.735000 0.845000 ;
+        RECT  595.385000 0.320000  595.555000 0.845000 ;
+        RECT  599.065000 0.320000  599.235000 0.845000 ;
+        RECT  602.745000 0.320000  602.915000 0.845000 ;
+        RECT  606.885000 0.320000  607.055000 0.845000 ;
+        RECT  611.025000 0.320000  611.195000 0.845000 ;
+        RECT  616.085000 0.320000  616.255000 0.845000 ;
+        RECT  622.985000 0.320000  623.155000 0.845000 ;
+        RECT  634.485000 0.320000  634.655000 0.845000 ;
+        RECT  637.705000 0.320000  637.875000 0.845000 ;
+        RECT  641.845000 0.320000  642.015000 0.845000 ;
+        RECT  647.825000 0.320000  647.995000 0.845000 ;
+        RECT  657.485000 0.320000  657.655000 0.845000 ;
+        RECT  660.705000 0.320000  660.875000 0.845000 ;
+        RECT  664.845000 0.320000  665.015000 0.845000 ;
+        RECT  670.825000 0.320000  670.995000 0.845000 ;
+        RECT  680.485000 0.320000  680.655000 0.845000 ;
+        RECT  682.325000 0.320000  682.495000 0.845000 ;
+        RECT  689.225000 0.320000  689.395000 0.845000 ;
+        RECT  697.965000 0.320000  698.135000 0.845000 ;
+        RECT  700.265000 0.320000  700.435000 0.845000 ;
+        RECT  703.485000 0.320000  703.655000 0.845000 ;
+        RECT  707.625000 0.320000  707.795000 0.845000 ;
+        RECT  712.685000 0.320000  712.855000 0.845000 ;
+        RECT  717.745000 0.320000  717.915000 0.845000 ;
+        RECT  722.805000 0.320000  722.975000 0.845000 ;
+        RECT  729.245000 0.320000  729.415000 0.845000 ;
+        RECT  740.285000 0.320000  740.455000 0.845000 ;
+        RECT  744.885000 0.320000  745.055000 0.845000 ;
+        RECT  750.865000 0.320000  751.035000 0.845000 ;
+        RECT  760.525000 0.320000  760.695000 0.845000 ;
+        RECT  762.825000 0.320000  762.995000 0.845000 ;
+        RECT  766.045000 0.320000  766.215000 0.845000 ;
+        RECT  771.105000 0.320000  771.275000 0.845000 ;
+        RECT  779.845000 0.320000  780.015000 0.845000 ;
+        RECT  782.605000 0.320000  782.775000 0.845000 ;
+        RECT  786.285000 0.320000  786.455000 0.845000 ;
+        RECT  792.265000 0.320000  792.435000 0.845000 ;
+        RECT  795.025000 0.320000  795.195000 0.845000 ;
+        RECT  799.625000 0.320000  799.795000 0.845000 ;
+        RECT  806.985000 0.320000  807.155000 0.845000 ;
+        RECT  810.205000 0.320000  810.375000 0.845000 ;
+        RECT  815.265000 0.320000  815.435000 0.845000 ;
+        RECT  823.545000 0.320000  823.715000 0.845000 ;
+        RECT  826.765000 0.320000  826.935000 0.845000 ;
+        RECT  832.285000 0.320000  832.455000 0.845000 ;
+        RECT  841.485000 0.320000  841.655000 0.845000 ;
+        RECT  845.165000 0.320000  845.335000 0.845000 ;
+        RECT  851.605000 0.320000  851.775000 0.845000 ;
+        RECT  861.725000 0.320000  861.895000 0.845000 ;
+        RECT  866.325000 0.320000  866.495000 0.845000 ;
+        RECT  873.225000 0.320000  873.395000 0.845000 ;
+        RECT  884.265000 0.320000  884.435000 0.845000 ;
+        RECT  886.565000 0.320000  886.735000 0.845000 ;
+        RECT  889.785000 0.320000  889.955000 0.845000 ;
+        RECT  894.845000 0.320000  895.015000 0.845000 ;
+        RECT  903.585000 0.320000  903.755000 0.845000 ;
+        RECT  906.345000 0.320000  906.515000 0.845000 ;
+        RECT  910.485000 0.320000  910.655000 0.845000 ;
+        RECT  916.465000 0.320000  916.635000 0.845000 ;
+        RECT  919.225000 0.320000  919.395000 0.845000 ;
+        RECT  923.825000 0.320000  923.995000 0.845000 ;
+        RECT  930.725000 0.320000  930.895000 0.845000 ;
+        RECT  933.945000 0.320000  934.115000 0.845000 ;
+        RECT  939.465000 0.320000  939.635000 0.845000 ;
+        RECT  947.285000 0.320000  947.455000 0.845000 ;
+        RECT  950.505000 0.320000  950.675000 0.845000 ;
+        RECT  956.025000 0.320000  956.195000 0.845000 ;
+        RECT  965.225000 0.320000  965.395000 0.845000 ;
+        RECT  969.365000 0.320000  969.535000 0.845000 ;
+        RECT  975.805000 0.320000  975.975000 0.845000 ;
+        RECT  985.925000 0.320000  986.095000 0.845000 ;
+        RECT  990.525000 0.320000  990.695000 0.845000 ;
+        RECT  997.425000 0.320000  997.595000 0.845000 ;
+        RECT 1008.005000 0.320000 1008.175000 0.845000 ;
+        RECT 1012.605000 0.320000 1012.775000 0.845000 ;
+        RECT 1017.205000 0.320000 1017.375000 0.845000 ;
+        RECT 1024.565000 0.320000 1024.735000 0.845000 ;
+        RECT 1027.785000 0.320000 1027.955000 0.845000 ;
+        RECT 1033.305000 0.320000 1033.475000 0.845000 ;
+        RECT 1042.505000 0.320000 1042.675000 0.845000 ;
+        RECT 1046.185000 0.320000 1046.355000 0.845000 ;
+        RECT 1050.325000 0.320000 1050.495000 0.845000 ;
+        RECT 1056.765000 0.320000 1056.935000 0.845000 ;
+        RECT 1059.525000 0.320000 1059.695000 0.845000 ;
+        RECT 1063.665000 0.320000 1063.835000 0.845000 ;
+        RECT 1070.565000 0.320000 1070.735000 0.845000 ;
+        RECT 1074.705000 0.320000 1074.875000 0.845000 ;
+        RECT 1079.305000 0.320000 1079.475000 0.845000 ;
+        RECT 1086.205000 0.320000 1086.375000 0.845000 ;
+        RECT 1089.885000 0.320000 1090.055000 0.845000 ;
+        RECT 1094.945000 0.320000 1095.115000 0.845000 ;
+        RECT 1102.765000 0.320000 1102.935000 0.845000 ;
+        RECT 1107.365000 0.320000 1107.535000 0.845000 ;
+        RECT 1112.425000 0.320000 1112.595000 0.845000 ;
+        RECT 1120.705000 0.320000 1120.875000 0.845000 ;
+        RECT 1124.845000 0.320000 1125.015000 0.845000 ;
+        RECT 1131.285000 0.320000 1131.455000 0.845000 ;
+        RECT 1142.325000 0.320000 1142.495000 0.845000 ;
+        RECT 1146.465000 0.320000 1146.635000 0.845000 ;
+        RECT 1151.065000 0.320000 1151.235000 0.845000 ;
+        RECT 1158.425000 0.320000 1158.595000 0.845000 ;
+        RECT 1161.645000 0.320000 1161.815000 0.845000 ;
+        RECT 1167.165000 0.320000 1167.335000 0.845000 ;
+        RECT 1175.905000 0.320000 1176.075000 0.845000 ;
+        RECT 1180.505000 0.320000 1180.675000 0.845000 ;
+        RECT 1185.565000 0.320000 1185.735000 0.845000 ;
+        RECT 1193.845000 0.320000 1194.015000 0.845000 ;
+        RECT 1197.985000 0.320000 1198.155000 0.845000 ;
+        RECT 1204.425000 0.320000 1204.595000 0.845000 ;
+        RECT 1215.925000 0.320000 1216.095000 0.845000 ;
+        RECT 1219.145000 0.320000 1219.315000 0.845000 ;
+        RECT 1224.665000 0.320000 1224.835000 0.845000 ;
+        RECT 1233.865000 0.320000 1234.035000 0.845000 ;
+        RECT 1237.545000 0.320000 1237.715000 0.845000 ;
+        RECT 1244.445000 0.320000 1244.615000 0.845000 ;
+        RECT 1255.945000 0.320000 1256.115000 0.845000 ;
+        RECT 1258.705000 0.320000 1258.875000 0.845000 ;
+        RECT 1261.925000 0.320000 1262.095000 0.845000 ;
+        RECT 1266.065000 0.320000 1266.235000 0.845000 ;
+        RECT 1269.745000 0.320000 1269.915000 0.845000 ;
+        RECT 1273.885000 0.320000 1274.055000 0.845000 ;
+        RECT 1278.945000 0.320000 1279.115000 0.845000 ;
+        RECT 1282.165000 0.320000 1282.335000 0.845000 ;
+        RECT 1285.845000 0.320000 1286.015000 0.845000 ;
+        RECT 1290.905000 0.320000 1291.075000 0.845000 ;
+        RECT 1295.045000 0.320000 1295.215000 0.845000 ;
+        RECT 1299.185000 0.320000 1299.355000 0.845000 ;
+        RECT 1304.245000 0.320000 1304.415000 0.845000 ;
+        RECT 1307.925000 0.320000 1308.095000 0.845000 ;
+        RECT 1312.065000 0.320000 1312.235000 0.845000 ;
+        RECT 1317.125000 0.320000 1317.295000 0.845000 ;
+        RECT 1321.725000 0.320000 1321.895000 0.845000 ;
+        RECT 1326.325000 0.320000 1326.495000 0.845000 ;
+        RECT 1332.305000 0.320000 1332.475000 0.845000 ;
+        RECT 1337.365000 0.320000 1337.535000 0.845000 ;
+        RECT 1342.885000 0.320000 1343.055000 0.845000 ;
+        RECT 1349.325000 0.320000 1349.495000 0.845000 ;
+        RECT 1365.425000 0.320000 1365.595000 0.845000 ;
+        RECT 1380.145000 0.320000 1380.315000 0.845000 ;
+        RECT 1395.325000 0.320000 1395.495000 0.845000 ;
+        RECT 1408.665000 0.320000 1408.835000 0.845000 ;
+        RECT 1422.005000 0.320000 1422.175000 0.845000 ;
+        RECT 1435.805000 0.320000 1435.975000 0.845000 ;
+        RECT 1450.985000 0.320000 1451.155000 0.845000 ;
+        RECT 1467.085000 0.320000 1467.255000 0.845000 ;
+        RECT 1480.885000 0.320000 1481.055000 0.845000 ;
+        RECT 1495.605000 0.320000 1495.775000 0.845000 ;
+        RECT 1511.245000 0.320000 1511.415000 0.845000 ;
+        RECT 1523.665000 0.320000 1523.835000 0.845000 ;
+        RECT 1537.465000 0.320000 1537.635000 0.845000 ;
+        RECT 1548.505000 0.320000 1548.675000 0.845000 ;
+        RECT 1560.005000 0.320000 1560.175000 0.845000 ;
+        RECT 1572.425000 0.320000 1572.595000 0.845000 ;
+        RECT 1580.245000 0.320000 1580.415000 0.845000 ;
+        RECT 1588.525000 0.320000 1588.695000 0.845000 ;
+        RECT 1598.185000 0.320000 1598.355000 0.845000 ;
+        RECT 1613.825000 0.320000 1613.995000 0.845000 ;
+        RECT 1630.845000 0.320000 1631.015000 0.845000 ;
+        RECT 1634.985000 0.320000 1635.155000 0.845000 ;
+        RECT 1641.885000 0.320000 1642.055000 0.845000 ;
+        RECT 1653.385000 0.320000 1653.555000 0.845000 ;
+        RECT 1663.045000 0.320000 1663.215000 0.845000 ;
+        RECT 1673.165000 0.320000 1673.335000 0.845000 ;
+        RECT 1684.205000 0.320000 1684.375000 0.845000 ;
+        RECT 1688.345000 0.320000 1688.515000 0.845000 ;
+        RECT 1695.245000 0.320000 1695.415000 0.845000 ;
+        RECT 1706.745000 0.320000 1706.915000 0.845000 ;
+        RECT 1716.865000 0.320000 1717.035000 0.845000 ;
+        RECT 1726.985000 0.320000 1727.155000 0.845000 ;
+        RECT 1738.025000 0.320000 1738.195000 0.845000 ;
+        RECT 1752.745000 0.320000 1752.915000 0.845000 ;
+        RECT 1755.505000 0.320000 1755.675000 0.845000 ;
+        RECT 1759.185000 0.320000 1759.355000 0.845000 ;
+        RECT 1762.865000 0.320000 1763.035000 0.845000 ;
+        RECT 1765.625000 0.320000 1765.795000 0.845000 ;
+        RECT 1768.385000 0.320000 1768.555000 0.845000 ;
+        RECT 1772.525000 0.320000 1772.695000 0.845000 ;
+        RECT 1778.505000 0.320000 1778.675000 0.845000 ;
+        RECT 1788.625000 0.320000 1788.795000 0.845000 ;
+        RECT 1807.485000 0.320000 1807.655000 0.845000 ;
+        RECT 1809.325000 0.320000 1809.495000 0.845000 ;
+        RECT 1811.625000 0.320000 1811.795000 0.845000 ;
+        RECT 1814.845000 0.320000 1815.015000 0.845000 ;
+        RECT 1818.985000 0.320000 1819.155000 0.845000 ;
+        RECT 1824.965000 0.320000 1825.135000 0.845000 ;
+        RECT 1832.325000 0.320000 1832.495000 0.845000 ;
+        RECT 1832.785000 0.320000 1832.955000 0.845000 ;
+        RECT 1841.985000 0.320000 1842.155000 0.845000 ;
+        RECT 1855.325000 0.320000 1855.495000 0.845000 ;
+        RECT 1881.545000 0.320000 1881.715000 0.845000 ;
+        RECT 1899.025000 0.320000 1899.195000 0.845000 ;
+        RECT 1925.245000 0.320000 1925.415000 0.845000 ;
+        RECT 1930.305000 0.320000 1930.475000 0.845000 ;
+        RECT 1935.825000 0.320000 1935.995000 0.845000 ;
+        RECT 1942.265000 0.320000 1942.435000 0.845000 ;
+        RECT 1942.265000 4.595000 1942.435000 5.120000 ;
+        RECT 1967.565000 0.320000 1967.735000 0.845000 ;
+        RECT 1967.565000 4.595000 1967.735000 5.120000 ;
+        RECT 1985.045000 0.320000 1985.215000 0.845000 ;
+        RECT 1985.045000 4.595000 1985.215000 5.120000 ;
+        RECT 2011.265000 0.320000 2011.435000 0.845000 ;
+        RECT 2011.265000 4.595000 2011.435000 5.120000 ;
+        RECT 2037.485000 0.320000 2037.655000 0.845000 ;
+        RECT 2037.485000 4.595000 2037.655000 5.120000 ;
+        RECT 2063.705000 0.320000 2063.875000 0.845000 ;
+        RECT 2063.705000 4.595000 2063.875000 5.120000 ;
     END
   END VGND
   PIN VPWR
@@ -39,6 +371,25 @@
         RECT 177.780000 1.550000 180.095000 2.265000 ;
         RECT 177.780000 2.565000 180.095000 3.280000 ;
         RECT 177.980000 2.265000 180.095000 2.565000 ;
+      LAYER nwell ;
+        RECT   -0.190000 1.305000 1367.860000 1.425000 ;
+        RECT   -0.190000 1.425000 1603.785000 1.435000 ;
+        RECT   -0.190000 1.435000 2064.210000 2.910000 ;
+        RECT   -0.190000 2.910000  234.790000 3.370000 ;
+        RECT   -0.190000 3.370000  228.350000 4.135000 ;
+        RECT  229.810000 3.370000  231.110000 4.135000 ;
+        RECT  233.490000 3.370000  234.790000 4.135000 ;
+        RECT 1343.010000 1.285000 1349.370000 1.305000 ;
+        RECT 1370.195000 1.305000 1382.580000 1.425000 ;
+        RECT 1384.915000 1.305000 1397.760000 1.425000 ;
+        RECT 1400.095000 1.305000 1411.100000 1.425000 ;
+        RECT 1413.435000 1.305000 1424.440000 1.425000 ;
+        RECT 1426.775000 1.305000 1603.785000 1.425000 ;
+        RECT 1606.485000 1.305000 1619.425000 1.435000 ;
+        RECT 1622.125000 1.305000 1740.460000 1.425000 ;
+        RECT 1622.125000 1.425000 2064.210000 1.435000 ;
+        RECT 1742.795000 1.305000 2064.210000 1.425000 ;
+        RECT 1941.930000 2.910000 2064.210000 4.135000 ;
     END
   END VPWR
   OBS
@@ -26491,6 +26842,396 @@
       RECT 174.580000 1.615000 176.180000 6.545000 ;
       RECT 177.780000 2.365000 177.880000 2.465000 ;
       RECT 177.780000 5.695000 177.880000 5.795000 ;
+    LAYER pwell ;
+      RECT    0.135000 -0.085000    0.305000 0.085000 ;
+      RECT    0.145000  5.355000    0.315000 5.525000 ;
+      RECT    4.290000 -0.085000    4.460000 0.085000 ;
+      RECT    7.505000  5.355000    7.675000 5.525000 ;
+      RECT    8.885000 -0.085000    9.055000 0.085000 ;
+      RECT   15.785000  5.355000   15.955000 5.525000 ;
+      RECT   16.705000 -0.085000   16.875000 0.085000 ;
+      RECT   19.905000 -0.085000   20.075000 0.085000 ;
+      RECT   21.765000  5.355000   21.935000 5.525000 ;
+      RECT   25.450000 -0.085000   25.620000 0.085000 ;
+      RECT   28.665000  5.355000   28.835000 5.525000 ;
+      RECT   33.725000  5.355000   33.895000 5.525000 ;
+      RECT   34.185000 -0.085000   34.355000 0.085000 ;
+      RECT   38.790000 -0.085000   38.960000 0.085000 ;
+      RECT   42.470000  5.355000   42.640000 5.525000 ;
+      RECT   43.385000 -0.085000   43.555000 0.085000 ;
+      RECT   50.285000 -0.085000   50.455000 0.085000 ;
+      RECT   52.130000  5.355000   52.300000 5.525000 ;
+      RECT   53.970000 -0.085000   54.140000 0.085000 ;
+      RECT   59.025000 -0.085000   59.195000 0.085000 ;
+      RECT   66.845000 -0.085000   67.015000 0.085000 ;
+      RECT   69.150000  5.355000   69.320000 5.525000 ;
+      RECT   70.530000 -0.085000   70.700000 0.085000 ;
+      RECT   74.665000 -0.085000   74.835000 0.085000 ;
+      RECT   81.105000 -0.085000   81.275000 0.085000 ;
+      RECT   83.865000 -0.085000   84.035000 0.085000 ;
+      RECT   88.010000 -0.085000   88.180000 0.085000 ;
+      RECT   88.010000  5.355000   88.180000 5.525000 ;
+      RECT   94.905000 -0.085000   95.075000 0.085000 ;
+      RECT   94.905000  5.355000   95.075000 5.525000 ;
+      RECT   99.050000 -0.085000   99.220000 0.085000 ;
+      RECT  105.490000 -0.085000  105.660000 0.085000 ;
+      RECT  107.325000  5.355000  107.495000 5.525000 ;
+      RECT  116.530000 -0.085000  116.700000 0.085000 ;
+      RECT  121.125000 -0.085000  121.295000 0.085000 ;
+      RECT  123.430000  5.355000  123.600000 5.525000 ;
+      RECT  125.270000 -0.085000  125.440000 0.085000 ;
+      RECT  129.865000 -0.085000  130.035000 0.085000 ;
+      RECT  136.310000  5.355000  136.480000 5.525000 ;
+      RECT  137.230000 -0.085000  137.400000 0.085000 ;
+      RECT  140.910000 -0.085000  141.080000 0.085000 ;
+      RECT  146.430000 -0.085000  146.600000 0.085000 ;
+      RECT  152.870000  5.355000  153.040000 5.525000 ;
+      RECT  155.630000 -0.085000  155.800000 0.085000 ;
+      RECT  159.310000  5.355000  159.480000 5.525000 ;
+      RECT  160.205000 -0.085000  160.375000 0.085000 ;
+      RECT  165.290000 -0.085000  165.460000 0.085000 ;
+      RECT  167.130000  5.355000  167.300000 5.525000 ;
+      RECT  173.565000 -0.085000  173.735000 0.085000 ;
+      RECT  173.570000  5.355000  173.740000 5.525000 ;
+      RECT  177.705000 -0.085000  177.875000 0.085000 ;
+      RECT  180.005000  5.355000  180.175000 5.525000 ;
+      RECT  184.150000 -0.085000  184.320000 0.085000 ;
+      RECT  186.905000  5.355000  187.075000 5.525000 ;
+      RECT  193.805000  5.355000  193.975000 5.525000 ;
+      RECT  195.190000 -0.085000  195.360000 0.085000 ;
+      RECT  198.870000 -0.085000  199.040000 0.085000 ;
+      RECT  201.165000  5.355000  201.335000 5.525000 ;
+      RECT  203.010000 -0.085000  203.180000 0.085000 ;
+      RECT  208.525000  5.355000  208.695000 5.525000 ;
+      RECT  210.370000 -0.085000  210.540000 0.085000 ;
+      RECT  213.590000 -0.085000  213.760000 0.085000 ;
+      RECT  216.805000  5.355000  216.975000 5.525000 ;
+      RECT  219.110000 -0.085000  219.280000 0.085000 ;
+      RECT  225.085000  5.355000  225.255000 5.525000 ;
+      RECT  226.005000  5.355000  226.175000 5.525000 ;
+      RECT  227.845000  5.355000  228.015000 5.525000 ;
+      RECT  228.310000 -0.085000  228.480000 0.085000 ;
+      RECT  230.605000  5.355000  230.775000 5.525000 ;
+      RECT  232.910000 -0.085000  233.080000 0.085000 ;
+      RECT  237.970000 -0.085000  238.140000 0.085000 ;
+      RECT  246.705000 -0.085000  246.875000 0.085000 ;
+      RECT  250.390000 -0.085000  250.560000 0.085000 ;
+      RECT  257.290000 -0.085000  257.460000 0.085000 ;
+      RECT  269.245000 -0.085000  269.415000 0.085000 ;
+      RECT  272.005000 -0.085000  272.175000 0.085000 ;
+      RECT  275.225000 -0.085000  275.395000 0.085000 ;
+      RECT  279.365000 -0.085000  279.535000 0.085000 ;
+      RECT  283.050000 -0.085000  283.220000 0.085000 ;
+      RECT  287.185000 -0.085000  287.355000 0.085000 ;
+      RECT  291.785000 -0.085000  291.955000 0.085000 ;
+      RECT  295.005000 -0.085000  295.175000 0.085000 ;
+      RECT  298.685000 -0.085000  298.855000 0.085000 ;
+      RECT  303.750000 -0.085000  303.920000 0.085000 ;
+      RECT  307.885000 -0.085000  308.055000 0.085000 ;
+      RECT  312.485000 -0.085000  312.655000 0.085000 ;
+      RECT  318.005000 -0.085000  318.175000 0.085000 ;
+      RECT  321.690000 -0.085000  321.860000 0.085000 ;
+      RECT  325.830000 -0.085000  326.000000 0.085000 ;
+      RECT  330.885000 -0.085000  331.055000 0.085000 ;
+      RECT  335.490000 -0.085000  335.660000 0.085000 ;
+      RECT  340.550000 -0.085000  340.720000 0.085000 ;
+      RECT  346.065000 -0.085000  346.235000 0.085000 ;
+      RECT  351.130000 -0.085000  351.300000 0.085000 ;
+      RECT  356.650000 -0.085000  356.820000 0.085000 ;
+      RECT  363.555000 -0.085000  363.725000 0.085000 ;
+      RECT  366.320000 -0.085000  366.490000 0.085000 ;
+      RECT  374.590000 -0.085000  374.760000 0.085000 ;
+      RECT  386.545000 -0.085000  386.715000 0.085000 ;
+      RECT  389.310000 -0.085000  389.480000 0.085000 ;
+      RECT  392.990000 -0.085000  393.160000 0.085000 ;
+      RECT  398.050000 -0.085000  398.220000 0.085000 ;
+      RECT  404.490000 -0.085000  404.660000 0.085000 ;
+      RECT  418.290000 -0.085000  418.460000 0.085000 ;
+      RECT  426.110000 -0.085000  426.280000 0.085000 ;
+      RECT  438.990000 -0.085000  439.160000 0.085000 ;
+      RECT  447.365000 -0.085000  447.535000 0.085000 ;
+      RECT  448.645000 -0.085000  448.815000 0.085000 ;
+      RECT  459.230000 -0.085000  459.400000 0.085000 ;
+      RECT  461.985000 -0.085000  462.155000 0.085000 ;
+      RECT  465.665000 -0.085000  465.835000 0.085000 ;
+      RECT  471.645000 -0.085000  471.815000 0.085000 ;
+      RECT  473.945000 -0.085000  474.115000 0.085000 ;
+      RECT  486.825000 -0.085000  486.995000 0.085000 ;
+      RECT  489.585000 -0.085000  489.755000 0.085000 ;
+      RECT  493.730000 -0.085000  493.900000 0.085000 ;
+      RECT  500.625000 -0.085000  500.795000 0.085000 ;
+      RECT  502.925000 -0.085000  503.095000 0.085000 ;
+      RECT  506.145000 -0.085000  506.315000 0.085000 ;
+      RECT  507.985000 -0.085000  508.155000 0.085000 ;
+      RECT  518.105000 -0.085000  518.275000 0.085000 ;
+      RECT  528.685000 -0.085000  528.855000 0.085000 ;
+      RECT  540.645000 -0.085000  540.815000 0.085000 ;
+      RECT  551.225000 -0.085000  551.395000 0.085000 ;
+      RECT  562.265000 -0.085000  562.435000 0.085000 ;
+      RECT  574.690000 -0.085000  574.860000 0.085000 ;
+      RECT  581.130000 -0.085000  581.300000 0.085000 ;
+      RECT  588.025000 -0.085000  588.195000 0.085000 ;
+      RECT  595.840000 -0.085000  596.010000 0.085000 ;
+      RECT  599.520000 -0.085000  599.690000 0.085000 ;
+      RECT  603.200000 -0.085000  603.370000 0.085000 ;
+      RECT  607.350000 -0.085000  607.520000 0.085000 ;
+      RECT  611.490000 -0.085000  611.660000 0.085000 ;
+      RECT  616.550000 -0.085000  616.720000 0.085000 ;
+      RECT  623.445000 -0.085000  623.615000 0.085000 ;
+      RECT  634.945000 -0.085000  635.115000 0.085000 ;
+      RECT  638.165000 -0.085000  638.335000 0.085000 ;
+      RECT  642.310000 -0.085000  642.480000 0.085000 ;
+      RECT  648.290000 -0.085000  648.460000 0.085000 ;
+      RECT  657.950000 -0.085000  658.120000 0.085000 ;
+      RECT  661.170000 -0.085000  661.340000 0.085000 ;
+      RECT  665.310000 -0.085000  665.480000 0.085000 ;
+      RECT  671.290000 -0.085000  671.460000 0.085000 ;
+      RECT  680.945000 -0.085000  681.115000 0.085000 ;
+      RECT  682.785000 -0.085000  682.955000 0.085000 ;
+      RECT  689.685000 -0.085000  689.855000 0.085000 ;
+      RECT  698.425000 -0.085000  698.595000 0.085000 ;
+      RECT  700.725000 -0.085000  700.895000 0.085000 ;
+      RECT  703.945000 -0.085000  704.115000 0.085000 ;
+      RECT  708.085000 -0.085000  708.255000 0.085000 ;
+      RECT  713.420000 -0.085000  713.640000 0.085000 ;
+      RECT  718.210000 -0.085000  718.380000 0.085000 ;
+      RECT  723.270000 -0.085000  723.440000 0.085000 ;
+      RECT  729.710000 -0.085000  729.880000 0.085000 ;
+      RECT  740.745000 -0.085000  740.915000 0.085000 ;
+      RECT  745.350000 -0.085000  745.520000 0.085000 ;
+      RECT  751.330000 -0.085000  751.500000 0.085000 ;
+      RECT  760.980000 -0.085000  761.150000 0.085000 ;
+      RECT  763.290000 -0.085000  763.460000 0.085000 ;
+      RECT  766.510000 -0.085000  766.680000 0.085000 ;
+      RECT  771.570000 -0.085000  771.740000 0.085000 ;
+      RECT  780.310000 -0.085000  780.480000 0.085000 ;
+      RECT  783.070000 -0.085000  783.240000 0.085000 ;
+      RECT  786.750000 -0.085000  786.920000 0.085000 ;
+      RECT  792.730000 -0.085000  792.900000 0.085000 ;
+      RECT  795.490000 -0.085000  795.660000 0.085000 ;
+      RECT  800.090000 -0.085000  800.260000 0.085000 ;
+      RECT  807.445000 -0.085000  807.615000 0.085000 ;
+      RECT  810.670000 -0.085000  810.840000 0.085000 ;
+      RECT  815.730000 -0.085000  815.900000 0.085000 ;
+      RECT  824.010000 -0.085000  824.180000 0.085000 ;
+      RECT  827.230000 -0.085000  827.400000 0.085000 ;
+      RECT  832.750000 -0.085000  832.920000 0.085000 ;
+      RECT  841.945000 -0.085000  842.115000 0.085000 ;
+      RECT  845.630000 -0.085000  845.800000 0.085000 ;
+      RECT  852.070000 -0.085000  852.240000 0.085000 ;
+      RECT  862.185000 -0.085000  862.355000 0.085000 ;
+      RECT  866.785000 -0.085000  866.955000 0.085000 ;
+      RECT  873.685000 -0.085000  873.855000 0.085000 ;
+      RECT  884.730000 -0.085000  884.900000 0.085000 ;
+      RECT  887.030000 -0.085000  887.200000 0.085000 ;
+      RECT  890.250000 -0.085000  890.420000 0.085000 ;
+      RECT  895.305000 -0.085000  895.475000 0.085000 ;
+      RECT  904.045000 -0.085000  904.215000 0.085000 ;
+      RECT  906.810000 -0.085000  906.980000 0.085000 ;
+      RECT  910.950000 -0.085000  911.120000 0.085000 ;
+      RECT  916.930000 -0.085000  917.100000 0.085000 ;
+      RECT  919.690000 -0.085000  919.860000 0.085000 ;
+      RECT  924.290000 -0.085000  924.460000 0.085000 ;
+      RECT  931.185000 -0.085000  931.355000 0.085000 ;
+      RECT  934.410000 -0.085000  934.580000 0.085000 ;
+      RECT  939.930000 -0.085000  940.100000 0.085000 ;
+      RECT  947.745000 -0.085000  947.915000 0.085000 ;
+      RECT  950.970000 -0.085000  951.140000 0.085000 ;
+      RECT  956.490000 -0.085000  956.660000 0.085000 ;
+      RECT  965.685000 -0.085000  965.855000 0.085000 ;
+      RECT  969.825000 -0.085000  969.995000 0.085000 ;
+      RECT  976.265000 -0.085000  976.435000 0.085000 ;
+      RECT  986.390000 -0.085000  986.560000 0.085000 ;
+      RECT  990.985000 -0.085000  991.155000 0.085000 ;
+      RECT  997.890000 -0.085000  998.060000 0.085000 ;
+      RECT 1008.470000 -0.085000 1008.640000 0.085000 ;
+      RECT 1013.070000 -0.085000 1013.240000 0.085000 ;
+      RECT 1017.665000 -0.085000 1017.835000 0.085000 ;
+      RECT 1025.025000 -0.085000 1025.195000 0.085000 ;
+      RECT 1028.245000 -0.085000 1028.415000 0.085000 ;
+      RECT 1033.770000 -0.085000 1033.940000 0.085000 ;
+      RECT 1042.965000 -0.085000 1043.135000 0.085000 ;
+      RECT 1046.650000 -0.085000 1046.820000 0.085000 ;
+      RECT 1050.790000 -0.085000 1050.960000 0.085000 ;
+      RECT 1057.230000 -0.085000 1057.400000 0.085000 ;
+      RECT 1059.980000 -0.085000 1060.150000 0.085000 ;
+      RECT 1064.125000 -0.085000 1064.295000 0.085000 ;
+      RECT 1071.025000 -0.085000 1071.195000 0.085000 ;
+      RECT 1075.165000 -0.085000 1075.335000 0.085000 ;
+      RECT 1079.765000 -0.085000 1079.935000 0.085000 ;
+      RECT 1086.665000 -0.085000 1086.835000 0.085000 ;
+      RECT 1090.345000 -0.085000 1090.515000 0.085000 ;
+      RECT 1095.405000 -0.085000 1095.575000 0.085000 ;
+      RECT 1103.225000 -0.085000 1103.395000 0.085000 ;
+      RECT 1107.800000 -0.085000 1107.970000 0.085000 ;
+      RECT 1112.890000 -0.085000 1113.060000 0.085000 ;
+      RECT 1121.165000 -0.085000 1121.335000 0.085000 ;
+      RECT 1125.305000 -0.085000 1125.475000 0.085000 ;
+      RECT 1131.750000 -0.085000 1131.920000 0.085000 ;
+      RECT 1142.785000 -0.085000 1142.955000 0.085000 ;
+      RECT 1146.910000 -0.085000 1147.080000 0.085000 ;
+      RECT 1151.525000 -0.085000 1151.695000 0.085000 ;
+      RECT 1158.885000 -0.085000 1159.055000 0.085000 ;
+      RECT 1162.110000 -0.085000 1162.280000 0.085000 ;
+      RECT 1167.625000 -0.085000 1167.795000 0.085000 ;
+      RECT 1176.370000 -0.085000 1176.540000 0.085000 ;
+      RECT 1180.955000 -0.085000 1181.125000 0.085000 ;
+      RECT 1186.025000 -0.085000 1186.195000 0.085000 ;
+      RECT 1194.305000 -0.085000 1194.475000 0.085000 ;
+      RECT 1198.450000 -0.085000 1198.620000 0.085000 ;
+      RECT 1204.875000 -0.085000 1205.045000 0.085000 ;
+      RECT 1216.390000 -0.085000 1216.560000 0.085000 ;
+      RECT 1219.610000 -0.085000 1219.780000 0.085000 ;
+      RECT 1225.125000 -0.085000 1225.295000 0.085000 ;
+      RECT 1234.330000 -0.085000 1234.500000 0.085000 ;
+      RECT 1238.005000 -0.085000 1238.175000 0.085000 ;
+      RECT 1244.910000 -0.085000 1245.080000 0.085000 ;
+      RECT 1256.405000 -0.085000 1256.575000 0.085000 ;
+      RECT 1259.170000 -0.085000 1259.340000 0.085000 ;
+      RECT 1262.390000 -0.085000 1262.560000 0.085000 ;
+      RECT 1266.530000 -0.085000 1266.700000 0.085000 ;
+      RECT 1270.205000 -0.085000 1270.375000 0.085000 ;
+      RECT 1274.345000 -0.085000 1274.515000 0.085000 ;
+      RECT 1279.400000 -0.085000 1279.570000 0.085000 ;
+      RECT 1282.625000 -0.085000 1282.795000 0.085000 ;
+      RECT 1286.310000 -0.085000 1286.480000 0.085000 ;
+      RECT 1291.365000 -0.085000 1291.535000 0.085000 ;
+      RECT 1295.505000 -0.085000 1295.675000 0.085000 ;
+      RECT 1299.650000 -0.085000 1299.820000 0.085000 ;
+      RECT 1304.710000 -0.085000 1304.880000 0.085000 ;
+      RECT 1308.390000 -0.085000 1308.560000 0.085000 ;
+      RECT 1312.520000 -0.085000 1312.690000 0.085000 ;
+      RECT 1317.590000 -0.085000 1317.760000 0.085000 ;
+      RECT 1322.190000 -0.085000 1322.360000 0.085000 ;
+      RECT 1326.785000 -0.085000 1326.955000 0.085000 ;
+      RECT 1332.765000 -0.085000 1332.935000 0.085000 ;
+      RECT 1337.830000 -0.085000 1338.000000 0.085000 ;
+      RECT 1343.345000 -0.085000 1343.515000 0.085000 ;
+      RECT 1349.785000 -0.085000 1349.955000 0.085000 ;
+      RECT 1365.955000 -0.010000 1365.975000 0.015000 ;
+      RECT 1380.675000 -0.010000 1380.695000 0.015000 ;
+      RECT 1395.855000 -0.010000 1395.875000 0.015000 ;
+      RECT 1409.195000 -0.010000 1409.215000 0.015000 ;
+      RECT 1422.535000 -0.010000 1422.555000 0.015000 ;
+      RECT 1436.270000 -0.085000 1436.440000 0.085000 ;
+      RECT 1451.450000 -0.085000 1451.620000 0.085000 ;
+      RECT 1467.545000 -0.085000 1467.715000 0.085000 ;
+      RECT 1481.345000 -0.085000 1481.515000 0.085000 ;
+      RECT 1496.065000 -0.085000 1496.235000 0.085000 ;
+      RECT 1511.705000 -0.085000 1511.875000 0.085000 ;
+      RECT 1524.125000 -0.085000 1524.295000 0.085000 ;
+      RECT 1537.925000 -0.085000 1538.095000 0.085000 ;
+      RECT 1548.965000 -0.085000 1549.135000 0.085000 ;
+      RECT 1560.465000 -0.085000 1560.635000 0.085000 ;
+      RECT 1572.890000 -0.085000 1573.060000 0.085000 ;
+      RECT 1580.710000 -0.085000 1580.880000 0.085000 ;
+      RECT 1588.990000 -0.085000 1589.160000 0.085000 ;
+      RECT 1598.645000 -0.085000 1598.815000 0.085000 ;
+      RECT 1614.285000 -0.085000 1614.455000 0.085000 ;
+      RECT 1631.305000 -0.085000 1631.475000 0.085000 ;
+      RECT 1635.445000 -0.085000 1635.615000 0.085000 ;
+      RECT 1642.345000 -0.085000 1642.515000 0.085000 ;
+      RECT 1653.845000 -0.085000 1654.015000 0.085000 ;
+      RECT 1663.510000 -0.085000 1663.680000 0.085000 ;
+      RECT 1673.625000 -0.085000 1673.795000 0.085000 ;
+      RECT 1684.665000 -0.085000 1684.835000 0.085000 ;
+      RECT 1688.805000 -0.085000 1688.975000 0.085000 ;
+      RECT 1695.705000 -0.085000 1695.875000 0.085000 ;
+      RECT 1707.205000 -0.085000 1707.375000 0.085000 ;
+      RECT 1717.325000 -0.085000 1717.495000 0.085000 ;
+      RECT 1727.535000 -0.085000 1727.705000 0.085000 ;
+      RECT 1738.555000 -0.010000 1738.575000 0.015000 ;
+      RECT 1753.205000 -0.085000 1753.375000 0.085000 ;
+      RECT 1755.965000 -0.085000 1756.135000 0.085000 ;
+      RECT 1759.650000 -0.085000 1759.820000 0.085000 ;
+      RECT 1763.325000 -0.085000 1763.495000 0.085000 ;
+      RECT 1766.085000 -0.085000 1766.255000 0.085000 ;
+      RECT 1768.850000 -0.085000 1769.020000 0.085000 ;
+      RECT 1772.990000 -0.085000 1773.160000 0.085000 ;
+      RECT 1778.965000 -0.085000 1779.135000 0.085000 ;
+      RECT 1789.085000 -0.085000 1789.255000 0.085000 ;
+      RECT 1807.945000 -0.085000 1808.115000 0.085000 ;
+      RECT 1809.785000 -0.085000 1809.955000 0.085000 ;
+      RECT 1812.085000 -0.085000 1812.255000 0.085000 ;
+      RECT 1815.305000 -0.085000 1815.475000 0.085000 ;
+      RECT 1819.445000 -0.085000 1819.615000 0.085000 ;
+      RECT 1825.420000 -0.055000 1825.540000 0.055000 ;
+      RECT 1825.895000 -0.050000 1826.055000 0.060000 ;
+      RECT 1826.835000 -0.060000 1826.945000 0.060000 ;
+      RECT 1828.630000 -0.120000 1828.850000 0.050000 ;
+      RECT 1833.245000 -0.085000 1833.415000 0.085000 ;
+      RECT 1842.445000 -0.085000 1842.615000 0.085000 ;
+      RECT 1848.425000 -0.085000 1848.595000 0.085000 ;
+      RECT 1848.885000 -0.085000 1849.055000 0.085000 ;
+      RECT 1854.865000 -0.085000 1855.035000 0.085000 ;
+      RECT 1855.785000 -0.085000 1855.955000 0.085000 ;
+      RECT 1868.205000 -0.085000 1868.375000 0.085000 ;
+      RECT 1868.665000 -0.085000 1868.835000 0.085000 ;
+      RECT 1881.085000 -0.085000 1881.255000 0.085000 ;
+      RECT 1882.005000 -0.085000 1882.175000 0.085000 ;
+      RECT 1886.145000 -0.085000 1886.315000 0.085000 ;
+      RECT 1890.285000 -0.085000 1890.455000 0.085000 ;
+      RECT 1894.425000 -0.085000 1894.595000 0.085000 ;
+      RECT 1898.565000 -0.085000 1898.735000 0.085000 ;
+      RECT 1899.485000 -0.085000 1899.655000 0.085000 ;
+      RECT 1905.465000 -0.085000 1905.635000 0.085000 ;
+      RECT 1905.925000 -0.085000 1906.095000 0.085000 ;
+      RECT 1911.905000 -0.085000 1912.075000 0.085000 ;
+      RECT 1912.365000 -0.085000 1912.535000 0.085000 ;
+      RECT 1918.345000 -0.085000 1918.515000 0.085000 ;
+      RECT 1918.805000 -0.085000 1918.975000 0.085000 ;
+      RECT 1924.785000 -0.085000 1924.955000 0.085000 ;
+      RECT 1925.980000 -0.085000 1926.200000 0.085000 ;
+      RECT 1931.500000 -0.085000 1931.720000 0.085000 ;
+      RECT 1937.940000 -0.085000 1938.160000 0.085000 ;
+      RECT 1942.725000 -0.085000 1942.895000 0.085000 ;
+      RECT 1942.725000  5.355000 1942.895000 5.525000 ;
+      RECT 1948.705000 -0.085000 1948.875000 0.085000 ;
+      RECT 1948.705000  5.355000 1948.875000 5.525000 ;
+      RECT 1961.125000 -0.085000 1961.295000 0.085000 ;
+      RECT 1961.125000  5.355000 1961.295000 5.525000 ;
+      RECT 1968.025000 -0.085000 1968.195000 0.085000 ;
+      RECT 1968.025000  5.355000 1968.195000 5.525000 ;
+      RECT 1972.165000 -0.085000 1972.335000 0.085000 ;
+      RECT 1972.165000  5.355000 1972.335000 5.525000 ;
+      RECT 1976.305000 -0.085000 1976.475000 0.085000 ;
+      RECT 1976.305000  5.355000 1976.475000 5.525000 ;
+      RECT 1980.445000 -0.085000 1980.615000 0.085000 ;
+      RECT 1980.445000  5.355000 1980.615000 5.525000 ;
+      RECT 1984.585000 -0.085000 1984.755000 0.085000 ;
+      RECT 1984.585000  5.355000 1984.755000 5.525000 ;
+      RECT 1985.505000 -0.085000 1985.675000 0.085000 ;
+      RECT 1985.505000  5.355000 1985.675000 5.525000 ;
+      RECT 1991.485000 -0.085000 1991.655000 0.085000 ;
+      RECT 1991.485000  5.355000 1991.655000 5.525000 ;
+      RECT 1991.945000 -0.085000 1992.115000 0.085000 ;
+      RECT 1991.945000  5.355000 1992.115000 5.525000 ;
+      RECT 1997.925000 -0.085000 1998.095000 0.085000 ;
+      RECT 1997.925000  5.355000 1998.095000 5.525000 ;
+      RECT 1998.385000 -0.085000 1998.555000 0.085000 ;
+      RECT 1998.385000  5.355000 1998.555000 5.525000 ;
+      RECT 2004.365000 -0.085000 2004.535000 0.085000 ;
+      RECT 2004.365000  5.355000 2004.535000 5.525000 ;
+      RECT 2004.825000 -0.085000 2004.995000 0.085000 ;
+      RECT 2004.825000  5.355000 2004.995000 5.525000 ;
+      RECT 2010.805000 -0.085000 2010.975000 0.085000 ;
+      RECT 2010.805000  5.355000 2010.975000 5.525000 ;
+      RECT 2011.725000 -0.085000 2011.895000 0.085000 ;
+      RECT 2011.725000  5.355000 2011.895000 5.525000 ;
+      RECT 2024.145000 -0.085000 2024.315000 0.085000 ;
+      RECT 2024.145000  5.355000 2024.315000 5.525000 ;
+      RECT 2024.605000 -0.085000 2024.775000 0.085000 ;
+      RECT 2024.605000  5.355000 2024.775000 5.525000 ;
+      RECT 2037.025000 -0.085000 2037.195000 0.085000 ;
+      RECT 2037.025000  5.355000 2037.195000 5.525000 ;
+      RECT 2037.945000 -0.085000 2038.115000 0.085000 ;
+      RECT 2037.945000  5.355000 2038.115000 5.525000 ;
+      RECT 2050.365000 -0.085000 2050.535000 0.085000 ;
+      RECT 2050.365000  5.355000 2050.535000 5.525000 ;
+      RECT 2050.825000 -0.085000 2050.995000 0.085000 ;
+      RECT 2050.825000  5.355000 2050.995000 5.525000 ;
+      RECT 2063.245000 -0.085000 2063.415000 0.085000 ;
+      RECT 2063.245000  5.355000 2063.415000 5.525000 ;
     LAYER via ;
       RECT 156.215000 4.120000 156.475000 4.380000 ;
       RECT 156.535000 4.120000 156.795000 4.380000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index bc39e99..79d0ec8 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
@@ -38,20 +38,6 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -60,6 +46,26 @@
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.460000 0.085000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
index 973d7ff..704ae2c 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
@@ -30,21 +30,28 @@
   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 INPUT ;
     USE GROUND ;
     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 INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
index 46f43b2..1a9069b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
@@ -30,21 +30,28 @@
   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 INPUT ;
     USE GROUND ;
     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 INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index 78b7d4e..1ced09e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -37,6 +37,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
@@ -46,6 +48,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_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 5b96794..a7abb70 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 3.355000 0.825000 3.595000 1.755000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index 87a79b0..3d0ef62 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 5.950000 0.475000 6.340000 1.415000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 6818dd7..5467825 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.320000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 10.705000 0.905000 10.940000 1.445000 ;
     END
   END Y
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index c16d96b..9265f9d 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.225950 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.440000 0.365000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index 300eebc..1981a7d 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.220950 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.545000 0.350000 0.865000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index c29b5e6..072d3a7 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.500950 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 1.565000 1.440000 1.895000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 8c8f2ed..c243d42 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 3.225000 1.535000 3.545000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index 4bc0370..a0f0f59 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.925000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 5.985000 0.905000 6.350000 1.415000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index 8d4cb26..93a1df8 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 8.705000 0.695000 8.995000 0.780000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index 6335e55..67d263c 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.309400 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 0.085000 1.440000 0.610000 2.465000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index 42705aa..b478b09 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.269400 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.680000 0.350000 0.930000 0.660000 ;
     END
   END X
+  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
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 1d639a9..ece0301 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.490800 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 1.685000 2.045000 1.855000 2.465000 ;
     END
   END X
+  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.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;