diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
index cfd3b5b..fa74c51 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111o_1 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
index 00c7551..a5a2c88 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111o_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
index b58885c..5fb3407 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111o_4 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
index 774eb19..f4dc178 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111oi_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
index 9cdd6f4..8cdffb2 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111oi_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
index 9d9c88e..cdc9a73 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2111oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2111oi_4 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
index d4f5ce1..c325e02 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211o_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
index 8d87bf0..f7ae847 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211o_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
index bca2f31..46f97d2 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211o_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
index 61db5f2..fa81ff5 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211oi_1 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
index 7798def..b10e648 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211oi_2 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
index 050fad7..70c5f8f 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a211oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a211oi_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
index fe8c898..0dbdcd4 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21bo_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21bo_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
index e5253be..25482be 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21bo_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21bo_2 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
index 691c889..717ec69 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21bo_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21bo_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
index 33192aa..262d0b4 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21boi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21boi_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
index 3078f69..709aa12 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21boi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21boi_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
index 3978f14..344e212 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21boi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21boi_4 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
index 760c542..d2e5ecc 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21o_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
index 086ec54..6521ab9 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21o_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
index 6bdb710..9d8aab1 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21o_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
index e0719a2..6a57f84 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21oi_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
index 5c24504..67e86d3 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21oi_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
index 138f48d..fdeb1b9 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a21oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a21oi_4 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
index 6b3b8db..7e9c955 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
index 289bdb7..cd7f3de 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221o_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
index 1a8fcee..9088291 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221o_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
index 7c59308..97f2167 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221oi_1 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
index 21ddd86..d53b839 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221oi_2 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
index c358534..dc86572 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a221oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a221oi_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef b/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
index 091dd84..fa3a1b9 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a222o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a222o_1 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef b/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
index b66a6a0..3eb4c04 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a222o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a222o_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
index a3b8019..b9705c7 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a222oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a222oi_1 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
index b287e54..a7fd0ef 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a222oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a222oi_2 ;
@@ -126,6 +123,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
index e484a3c..f213121 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22o_1 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
index bb6c378..4489cd2 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22o_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
index c540804..15cd6d6 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22o_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
index e0c391f..10816f0 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22oi_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
index 428ef41..c46aada 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22oi_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
index aef9689..fadb939 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a22oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a22oi_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
index 4566809..a298ed3 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2o_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
index a97839d..cf13171 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2o_2 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
index 24d3b76..1c29d2d 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2o_4 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
index 339c598..40975cb 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2oi_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
index 761546e..cb01a60 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2oi_2 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
index 427eae6..b146b6e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a2bb2oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a2bb2oi_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
index 7fac044..be2a177 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311o_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
index 076b8ca..02c7a3c 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311o_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
index a90ee46..3d3ddc7 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311o_4 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
index 3271353..ff95ed6 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311oi_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
index 5321409..a5c0c8e 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311oi_2 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
index c9fc5ec..1c8dc05 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a311oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a311oi_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
index b08c9ea..63131b2 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31o_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
index 96a4c46..f37314c 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31o_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
index 82dfc74..d8b6df4 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31o_4 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
index 02223ce..d644277 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31oi_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
index 5940cb6..696d2fc 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31oi_2 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
index 8139156..eb488d0 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a31oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a31oi_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
index 7705505..4ac1944 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
index c39b1d3..dde6e3f 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32o_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
index e8a59ef..72c66cf 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32o_4 ;
@@ -105,6 +102,24 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.100000 1.780000 ;
+        RECT -0.190000 1.780000 8.350000 3.520000 ;
+        RECT  4.895000 1.660000 8.350000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
index d311fbc..81caaf4 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32oi_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
index 93f9335..dc24cfd 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32oi_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
index 1933abc..17a19ed 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a32oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a32oi_4 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
index 71465de..6dbb1a3 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
index e8ac7a7..d2f9f6e 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41o_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
index f277a96..67785cf 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41o_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
index 499e138..cdc1e11 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41oi_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
index 84a8481..d8198fb 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41oi_2 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
index 97fde2f..00c726d 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__a41oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__a41oi_4 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
index e5db397..21cc26a 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
index d150a5f..0bab8db 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
index f941897..31756a5 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
index 1a13464..bc51204 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2b_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
index fbcd34b..87f5955 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2b_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
index c510e4e..dc372c8 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and2b_4 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
index 8f8c9f3..8f9b5de 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
index 42a3d9a..18ebc4c 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
index ca02e8a..bd0faad 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
index 9d3073e..043aec7 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3b_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
index 0dd3e07..14fa6d4 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3b_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
index 27745fd..d6b37a0 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and3b_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
index 1799e82..d22d914 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
index c61f151..f870118 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4_2 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
index 596cfe6..cca3ede 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
index 205f762..84d9f07 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4b_1 ;
@@ -83,6 +80,24 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.370000 1.940000 ;
+        RECT -0.190000 1.940000 4.510000 3.520000 ;
+        RECT  3.220000 1.660000 4.510000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
index 67913f5..46a581b 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4b_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
index d2b5c94..fc55e95 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4b_4 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
index f8e1be4..7a42c04 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4bb_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
index d34a9d5..6ece5c2 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4bb_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
index 1f62ee2..845cfd4 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__and4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__and4bb_4 ;
@@ -86,6 +83,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.720000 1.760000 ;
+        RECT -0.190000 1.760000 9.310000 3.520000 ;
+        RECT  5.970000 1.660000 9.310000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
index 026e5c9..717d571 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__buf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__buf_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
index 3dd89a5..75f908c 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__buf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__buf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
index e4a24e0..c8ffec7 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__buf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__buf_2 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
index 407e648..07331d3 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__buf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__buf_4 ;
@@ -62,6 +59,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
index 091a6a2..637c5e8 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__buf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__buf_8 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
index a14a247..4e1dfd9 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__bufbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__bufbuf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
index c78fd32..57832c6 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__bufbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__bufbuf_8 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
index a44bc6e..e78ae76 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__bufinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__bufinv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
index 415390a..8c0bc1f 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__bufinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__bufinv_8 ;
@@ -61,6 +58,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
index 8e35d4c..1f807d8 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkbuf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkbuf_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
index 35bb6ab..59808fb 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkbuf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
index 4b961b5..23a784a 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkbuf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkbuf_2 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
index e6a36f9..615a6e9 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkbuf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkbuf_4 ;
@@ -60,6 +57,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
index c7e7e35..a88db17 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkbuf_8 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
index 0b17879..e576b2e 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv3sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv3sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
index 72c3012..5b0c722 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv3sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv3sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
index 7e8fabc..da7b688 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv3sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv3sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
index 67f9782..dbaf628 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv5sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv5sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
index c9590ff..a6a6b48 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv5sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv5sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
index 55ac4bf..9bc3a1c 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkdlyinv5sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkdlyinv5sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
index f4da2fb..7a5e69a 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkinv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkinv_1 ;
@@ -59,6 +56,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
index bce7b2c..55535a4 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkinv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
index 470727e..1ef0492 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkinv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkinv_2 ;
@@ -59,6 +56,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
index 363332d..8ee4b6f 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkinv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkinv_4 ;
@@ -62,6 +59,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
index df8a624..e57fd8c 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__clkinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__clkinv_8 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
index 65b0e32..3adbdc7 100644
--- a/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__conb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__conb_1 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
index cc23dae..74303c2 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__decap_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__decap_4 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
index b2ed538..abc83d8 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__decap_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__decap_8 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
index 34ee676..23e8f82 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfbbn_1 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
index 4ebaa9d..f0169b5 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfbbn_2 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
index 8b068e8..dde710e 100644
--- a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfbbp_1 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
index 512a5a2..a7d3af0 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrbp_1 ;
@@ -91,6 +88,24 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+        RECT  1.415000 1.620000  7.060000 1.660000 ;
+        RECT  5.540000 1.555000  7.060000 1.620000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
index ebd891d..c518b63 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrbp_2 ;
@@ -93,6 +90,25 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.025000 2.245000 ;
+        RECT -0.190000 2.245000 14.110000 3.520000 ;
+        RECT  5.200000 1.660000 14.110000 2.245000 ;
+        RECT 10.235000 1.580000 12.385000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
index 756fb61..e5ab06d 100644
--- a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrtn_1 ;
@@ -80,6 +77,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.225000 1.675000 ;
+        RECT -0.190000 1.675000 11.230000 3.520000 ;
+        RECT  6.920000 1.660000 11.230000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
index 84ed139..752b289 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrtp_1 ;
@@ -81,6 +78,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  1.390000 1.650000  6.400000 1.660000 ;
+        RECT  5.320000 1.555000  6.400000 1.650000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
index 3252731..4f350e3 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrtp_2 ;
@@ -79,6 +76,23 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+        RECT  1.390000 1.555000  6.930000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
index c82f7e9..12f876f 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfrtp_4 ;
@@ -88,6 +85,23 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+        RECT  1.400000 1.650000  2.935000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
index 603379d..ab6c32b 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfsbp_1 ;
@@ -89,6 +86,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.715000 1.660000 ;
+        RECT  5.675000 1.525000  6.715000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
index c8f666d..de6eacc 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfsbp_2 ;
@@ -88,6 +85,24 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  0.965000 1.610000  6.735000 1.660000 ;
+        RECT  5.695000 1.525000  6.735000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
index e6a4250..54a989e 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfstp_1 ;
@@ -77,6 +74,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.940000 1.570000  6.430000 1.660000 ;
+        RECT  5.390000 1.525000  6.430000 1.570000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
index 562ac5f..1401dcf 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfstp_2 ;
@@ -79,6 +76,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.775000 1.660000 ;
+        RECT  5.735000 1.525000  6.775000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
index 6f0482d..93e00ec 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfstp_4 ;
@@ -83,6 +80,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  5.505000 1.555000  6.545000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
index 732ea4f..df2be11 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfxbp_1 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
index 0061438..9733d76 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfxbp_2 ;
@@ -77,6 +74,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.700000 1.940000 ;
+        RECT -0.190000 1.940000 11.230000 3.520000 ;
+        RECT  5.205000 1.660000 11.230000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
index 0df9783..fc0f0e5 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfxtp_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
index 2333e5e..000181b 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfxtp_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
index 6c44cdd..4c538c5 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dfxtp_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
index d5e679a..259a5af 100644
--- a/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__diode_2
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hs__diode_2 ;
@@ -28,11 +25,24 @@
   SIZE  0.960000 BY  3.330000 ;
   PIN DIODE
     ANTENNADIFFAREA  0.641700 ;
+    ANTENNAGATEAREA  0.641700 ;
     PORT
       LAYER li1 ;
         RECT 0.095000 0.265000 0.865000 3.065000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
index 8a8d89a..5f82f3e 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlclkp_1 ;
@@ -64,6 +61,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.670000 1.785000 ;
+        RECT -0.190000 1.785000 6.910000 3.520000 ;
+        RECT  5.035000 1.660000 6.910000 1.785000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
index cf874b0..aec049a 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlclkp_2 ;
@@ -63,6 +60,25 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 7.870000 3.520000 ;
+        RECT  4.355000 1.755000 7.870000 1.780000 ;
+        RECT  6.205000 1.660000 7.870000 1.755000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
index c103e47..cb25b54 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlclkp_4 ;
@@ -70,6 +67,25 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.215000 1.705000 ;
+        RECT -0.190000 1.705000 3.205000 1.930000 ;
+        RECT -0.190000 1.930000 8.830000 3.520000 ;
+        RECT  4.475000 1.660000 8.830000 1.930000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
index 8d1aead..0596889 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrbn_1 ;
@@ -85,6 +82,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.535000 1.560000 7.080000 1.660000 ;
+        RECT  5.025000 1.530000 7.080000 1.560000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
index 2dbc1b0..449364b 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrbn_2 ;
@@ -85,6 +82,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  1.455000 1.560000 2.295000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
index c5a3b3b..6bf6cfc 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrbp_1 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
index a726cbf..aebd1b0 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrbp_2 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
index 98bea84..7852b14 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtn_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
index bc93da9..9d71cb2 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtn_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
index 574af54..e129ac3 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtn_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
index 5ca9493..d0511c5 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtp_1 ;
@@ -74,6 +71,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 6.910000 3.520000 ;
+        RECT  2.905000 1.660000 6.910000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
index 5b7a9f2..9946da1 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtp_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
index edd3236..2c68ffb 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlrtp_4 ;
@@ -78,6 +75,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.480000 1.780000 ;
+        RECT -0.190000 1.780000 9.310000 3.520000 ;
+        RECT  2.870000 1.660000 9.310000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
index c7b6ada..9280dd6 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxbn_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  4.625000 1.580000 5.695000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
index aefebac..72b159d 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxbn_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
index fb60c74..306985d 100644
--- a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxbp_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
index 761bfa9..b670bd2 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxtn_1 ;
@@ -63,6 +60,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
index 1a2dad3..d091b5a 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxtn_2 ;
@@ -65,6 +62,23 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+        RECT  4.670000 1.635000 5.740000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
index 14329e8..180cd21 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxtn_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
index 12b8af9..b027843 100644
--- a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlxtp_1 ;
@@ -65,6 +62,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  4.110000 1.505000 5.865000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
index a4b5807..a4127d9 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlygate4sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlygate4sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
index f72d653..445f7ba 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlygate4sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlygate4sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
index 4f10d30..423e2c6 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlygate4sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlygate4sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
index d636fd2..d0d67ed 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlymetal6s2s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlymetal6s2s_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
index 1229f38..2ccb289 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlymetal6s4s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlymetal6s4s_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
index e6ba9e1..46eaf15 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__dlymetal6s6s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__dlymetal6s6s_1 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
index 9d3e838..5452974 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ebufn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ebufn_1 ;
@@ -69,6 +66,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
index 00c36db..7ce70e4 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ebufn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ebufn_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
index c355365..84df99d 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ebufn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ebufn_4 ;
@@ -69,6 +66,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
index 0b21518..8c769a4 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ebufn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ebufn_8 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
index 86fe646..755c7d6 100644
--- a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__edfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__edfxbp_1 ;
@@ -85,6 +82,24 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  4.945000 1.650000  6.045000 1.660000 ;
+        RECT 11.870000 1.645000 12.940000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
index 9ca29b6..bbac95f 100644
--- a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__edfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__edfxtp_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  3.525000 1.580000  4.590000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
index b260172..a64b5ec 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvn_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
index 2a580a8..d5d2e74 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvn_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
index 128c058..290e7f2 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvn_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
index b016041..0bcd1c0 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvn_8 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
index f26aa0e..fc669a0 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvp_1 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
index 49640a2..465c967 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvp_2 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
index 74b0dc3..7681d31 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvp_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
index 05276eb..5f54bae 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__einvp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__einvp_8 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
index a38d951..add0b9d 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fa_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fa_1 ;
@@ -98,6 +95,23 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.500000 1.555000 7.480000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
index 553f70e..d6d24d9 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fa_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fa_2 ;
@@ -105,6 +102,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  0.635000 1.555000 5.915000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
index ef7eeff..2a78e3e 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fa_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fa_4 ;
@@ -109,6 +106,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.635000 1.555000  6.620000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
index 7991a9d..f9498fe 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fah_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fah_1 ;
@@ -87,6 +84,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.165000 1.940000 ;
+        RECT -0.190000 1.940000 14.110000 3.520000 ;
+        RECT  5.525000 1.605000 12.450000 1.660000 ;
+        RECT  5.525000 1.660000 14.110000 1.940000 ;
+        RECT  9.485000 1.530000 12.450000 1.605000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
index c652174..192590e 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fah_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fah_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
index 356c72e..58b185d 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fah_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fah_4 ;
@@ -91,6 +88,25 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  7.055000 1.715000 ;
+        RECT -0.190000 1.715000 15.550000 3.520000 ;
+        RECT  1.415000 1.630000  7.055000 1.660000 ;
+        RECT  8.400000 1.660000 15.550000 1.715000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
index 9a2c599..740d916 100644
--- a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fahcin_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fahcin_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
index a9e9e3e..fe774e4 100644
--- a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fahcon_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__fahcon_1 ;
@@ -87,6 +84,23 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+        RECT  1.250000 1.645000  5.035000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
index 26fdf76..5cfb198 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_1
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_1 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
index 925211f..ce0d93b 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_2
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_2 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
index cf84432..75cd868 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_4 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
index 8602d2a..e1e24a2 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_8 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
index e2de4e4..00213e8 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_2
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hs__fill_diode_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
index a72451b..58e0396 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_4
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hs__fill_diode_4 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
index 69c8d99..e91a411 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_8
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hs__fill_diode_8 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
index 9ec2cf1..82c8408 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ha_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ha_1 ;
@@ -78,6 +75,24 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.745000 1.780000 ;
+        RECT -0.190000 1.780000 4.990000 3.520000 ;
+        RECT  3.110000 1.660000 4.990000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
index 7e25005..274bee2 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ha_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ha_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
index cf211e7..54d60c4 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__ha_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__ha_4 ;
@@ -79,6 +76,23 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+        RECT  3.545000 1.585000  4.805000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
index f211cbd..811ec5a 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__inv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__inv_1 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
index bf00d44..f6456d0 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__inv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__inv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
index d096b5a..fc6841d 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__inv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__inv_2 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
index 79ad896..217b0ba 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__inv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__inv_4 ;
@@ -60,6 +57,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
index 5fa250c..984962d 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__inv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__inv_8 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
index 24dcc34..6036359 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__maj3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__maj3_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
index 73cef7b..53fdaa9 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__maj3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__maj3_2 ;
@@ -76,6 +73,23 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+        RECT  1.875000 1.555000 3.825000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
index e22b6e0..c2efd38 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__maj3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__maj3_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
index d2a15b5..b2578e0 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
index 5b3a2de..87b80b8 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
index fa2d361..ddba818 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2_4 ;
@@ -82,6 +79,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  0.850000 1.470000 1.690000 1.575000 ;
+        RECT  0.850000 1.575000 2.930000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
index 883446a..eecc148 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2i_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2i_1 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
index b684e05..db008d9 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2i_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2i_2 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
index 1382c6c..fbbdd70 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux2i_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux2i_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
index 72ee760..f9a0e45 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux4_1 ;
@@ -101,6 +98,23 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  0.680000 1.525000 4.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
index 83ca3b6..9939d11 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux4_2 ;
@@ -111,6 +108,24 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  6.910000 1.760000 ;
+        RECT -0.190000 1.760000 10.750000 3.520000 ;
+        RECT  8.275000 1.660000 10.750000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
index 4f6bc5d..e3d8f3d 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__mux4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__mux4_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
index 3667bc0..17afd66 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
index acc7b16..4ec4f35 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
index 3eec8d6..b18eaf3 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
index f2a17be..e8ecee7 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2_8 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
index 2053fc9..ebc8eda 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2b_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
index 318c71d..2d8b200 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2b_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
index 756a382..73df437 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand2b_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
index 7a60511..0d6a9a2 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
index 7924444..5f78e9f 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
index 7d329eb..d10c6b8 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3_4 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
index 025ce95..5f2691b 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3b_1 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
index 0fbe695..8053391 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3b_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
index 0492324..0d2ff21 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand3b_4 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
index f9b66d8..373b215 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
index bb44727..08d1d4c 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4_2 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
index bc08c11..cf0306d 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
index b79a18a..f5af3d8 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4b_1 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
index dafa9d7..467ee74 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4b_2 ;
@@ -90,6 +87,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
index 84819c9..a08496a 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4b_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
index cbaef63..b2c0c26 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4bb_1 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
index 1998c77..f6d6482 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4bb_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
index 9e48589..c91eef4 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nand4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nand4bb_4 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
index 9f5f264..e6a0965 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
index bb180c6..4771cf3 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2_2 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
index 5279512..f9d6823 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2_4 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
index f862bb1..76491b1 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2_8 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
index 4265250..b7b6ec6 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2b_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
index 8f819af..d85c24f 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2b_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
index 1dd4746..c97b0c9 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor2b_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
index e70af3c..94dbe4d 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
index 2cebb3c..3eae318 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3_2 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
index f07b3ca..87daf79 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3_4 ;
@@ -88,6 +85,23 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+        RECT  1.780000 1.590000 3.830000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
index c184924..dad68ac 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3b_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
index 56f01fd..77ae5af 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3b_2 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
index d419b77..bcccb82 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor3b_4 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
index af9a66a..c178b11 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
index cd23bae..457116a 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
index 6c1c751..c165a49 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
index 4ffc567..84a89bd 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4b_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
index fce9f71..c2dce1b 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4b_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
index 11b3ee9..179d777 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4b_4 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
index c1484bc..dfd2a27 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4bb_1 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
index 641ae90..23a2ed5 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4bb_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
index 1ff61f7..345591c 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__nor4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__nor4bb_4 ;
@@ -102,6 +99,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  2.480000 1.565000  8.675000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
index dbb0f92..98177c9 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
index abf4c32..cd88454 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111a_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
index 42622c2..fcd57e1 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111a_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
index 8565de6..884a757 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111ai_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
index e72857d..7d18aed 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111ai_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
index c5c83c3..d764fff 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2111ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2111ai_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
index 7733190..4328ce8 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211a_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
index 19f1b0f..fc0f7db 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211a_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
index c2cd68c..c6863c9 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
index c997295..1801513 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211ai_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
index b96037d..3116f6a 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211ai_2 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
index de7721a..05d7969 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o211ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o211ai_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
index 4ca259a..769fdb2 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21a_1 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
index 215ac23..7cb2a56 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21a_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
index c94612a..8a17a7c 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21a_4 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
index 0c3429b..852cb73 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ai_1 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
index fa0754d..c874f39 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ai_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
index 1d85f9b..adaafb0 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ai_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
index b257959..9023730 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ba_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ba_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
index cb270ef..8618664 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ba_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ba_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
index a9ee043..ca027db 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21ba_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21ba_4 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
index ff9ec9f..1d76679 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21bai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21bai_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
index 5ef1968..c9b3260 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21bai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21bai_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
index 7f5b83f..0f7c10a 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o21bai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o21bai_4 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
index 305f1b4..795a0da 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
index d344e7b..e4dd51c 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221a_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
index be7dd00..74586b4 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221a_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
index 8a6c134..3d9d5d5 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221ai_1 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
index 3f46357..f179c90 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221ai_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
index 8bca47d..fe91beb 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o221ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o221ai_4 ;
@@ -109,6 +106,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
index cc9c448..c696e13 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22a_1 ;
@@ -84,6 +81,24 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.675000 ;
+        RECT -0.190000 1.675000 4.030000 3.520000 ;
+        RECT  3.190000 1.660000 4.030000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
index c4a1eb4..c33c1aa 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22a_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
index cb94aee..cb9448b 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22a_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
index 91ac5ba..91c19b3 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22ai_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
index 637bc1d..f757f82 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22ai_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
index 866b219..6b8bf11 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o22ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o22ai_4 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
index 9496fe8..8ed55bd 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2a_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
index 1cc7feb..6536843 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2a_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
index c4e0eff..969512b 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
index b257732..4ca6360 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2ai_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
index f665af4..9876a30 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2ai_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
index f7c342a..5441fe7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o2bb2ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o2bb2ai_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
index b3303f6..791202e 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311a_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
index f4f58d7..7fccd4e 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311a_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
index f2ac2d8..fcf7a74 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311a_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
index a655cca..7ced203 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311ai_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
index b15f880..4dfcf74 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311ai_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
index f42eac6..2bb7668 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o311ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o311ai_4 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
index c649d75..db2a7ca 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31a_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
index 94e41ee..6d477ac 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31a_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
index dfcd4a6..222a559 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
index ef4d4e7..d695fa6 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31ai_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
index 0f49f09..37970fd 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31ai_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
index 13db9a0..7fc18ff 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o31ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o31ai_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
index 10a20a1..8d7ea57 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
index f6eda62..1daf362 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32a_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
index 6f86a36..2cabcad 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32a_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
index 26691a8..65d0aaf 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32ai_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
index fd08052..c042663 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32ai_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
index d2f330a..1dd65a3 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o32ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o32ai_4 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
index 317dc80..449f0da 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
index d2acb64..f67b308 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41a_2 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
index 02449ce..9d048a5 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41a_4 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
index 5d0b8b0..7e7a4f0 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41ai_1 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
index 5067b5c..52c8dfa 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41ai_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
index a81d7e7..e4f9acc 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__o41ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__o41ai_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
index 81fe1ff..1945093 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
index c011886..5940a5f 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2_2 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
index 2b187c4..d9053d8 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
index c3198f5..a904b14 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2b_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
index 761bc98..ba7b70e 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2b_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
index b3da52f..1f7b00b 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or2b_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
index 8dff4ee..4395589 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
index 32d397f..5df5d28 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3_2 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
index 28d5dc8..96af0e4 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
index 7f71b66..68b595f 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3b_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
index 0a466eb..32e52ed 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3b_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
index 27b2df9..c65d81c 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or3b_4 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
index 14f54c6..a194d4c 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
index b6c690c..461bc46 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4_2 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
index a025cc1..2839ac4 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
index fff7b78..cdf73b9 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4b_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
index cc332fc..c855d9a 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4b_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
index e4c9d1e..c2834a2 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4b_4 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
index 2150b71..e68bc7d 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4bb_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
index 7f9b93a..cf4fa0e 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4bb_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
index 8deef78..fa7f90d 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__or4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__or4bb_4 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
index 0b352ce..7abdb95 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfbbn_1 ;
@@ -116,6 +113,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT 13.420000 1.550000 15.300000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
index 05c5c41..6f94107 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfbbn_2 ;
@@ -117,6 +114,22 @@
         RECT 0.000000 -0.245000 18.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 18.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 18.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
index a01dc34..b311afc 100644
--- a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfbbp_1 ;
@@ -123,6 +120,23 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+        RECT 12.680000 1.560000 14.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
index 50dfded..7128e8c 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrbp_1 ;
@@ -109,6 +106,24 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.110000 3.520000 ;
+        RECT  4.095000 1.640000  9.515000 1.660000 ;
+        RECT  8.005000 1.555000  9.515000 1.640000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
index 772080a..3e6f18b 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrbp_2 ;
@@ -109,6 +106,24 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.070000 3.520000 ;
+        RECT  7.970000 1.555000  9.470000 1.595000 ;
+        RECT  7.970000 1.595000 12.540000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
index 2ae3430..e52ba9d 100644
--- a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrtn_1 ;
@@ -98,6 +95,24 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  5.995000 1.780000 ;
+        RECT -0.190000 1.780000 14.110000 3.520000 ;
+        RECT  9.725000 1.660000 14.110000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
index 0a19e27..7fbded6 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrtp_1 ;
@@ -100,6 +97,23 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+        RECT  8.145000 1.555000  9.665000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
index c2471e7..c035ac4 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrtp_2 ;
@@ -100,6 +97,23 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  8.120000 1.555000  9.780000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
index 9603b78..727d12d 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfrtp_4 ;
@@ -106,6 +103,23 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.070000 3.520000 ;
+        RECT  8.125000 1.555000  9.645000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
index 8b79b55..9ae5a6d 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfsbp_1 ;
@@ -107,6 +104,23 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  7.405000 1.555000  8.470000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
index 2b37725..2f518e2 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfsbp_2 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 17.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
index 0a71e36..14507e5 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfstp_1 ;
@@ -98,6 +95,23 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.110000 3.520000 ;
+        RECT  7.455000 1.525000  8.515000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
index a2b9599..acaad43 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfstp_2 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
index 85e2b9a..3d22c6d 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfstp_4 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
index 64c1431..65fee2a 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfxbp_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
index b442083..4086801 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfxbp_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
index e0f18af..648ec2f 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfxtp_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
index 4eaf291..373f91c 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfxtp_2 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
index cbcaa4f..3a3e54a 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdfxtp_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
index 5a216fa..83a416d 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdlclkp_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  3.910000 1.580000 4.980000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
index ad7cc96..1e42535 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdlclkp_2 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  3.840000 1.560000 5.890000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
index 3858402..326e323 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sdlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sdlclkp_4 ;
@@ -79,6 +76,24 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  1.385000 1.650000 5.370000 1.660000 ;
+        RECT  4.270000 1.575000 5.370000 1.650000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
index 0234fe3..ce4fd24 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sedfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sedfxbp_1 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
index 7d63196..2e8c089 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sedfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sedfxbp_2 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 17.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
index 7d26c0e..3b99881 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sedfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sedfxtp_1 ;
@@ -90,6 +87,23 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.550000 3.520000 ;
+        RECT  6.020000 1.600000  7.080000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
index 8450f38..ff8fc2d 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sedfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sedfxtp_2 ;
@@ -93,6 +90,23 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+        RECT  6.200000 1.640000  7.305000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
index 008d23f..8c4b225 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__sedfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__sedfxtp_4 ;
@@ -96,6 +93,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT  6.115000 1.625000  7.180000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
index 66502d1..a2441f4 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tap_1 ;
@@ -43,6 +40,10 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -67,6 +68,8 @@
     LAYER mcon ;
       RECT 0.155000 -0.085000 0.325000 0.085000 ;
       RECT 0.155000  3.245000 0.325000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 0.670000 3.520000 ;
   END
 END sky130_fd_sc_hs__tap_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
index 6fe7389..b61b997 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tap_2 ;
@@ -43,6 +40,10 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.870000 1.440000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -69,6 +70,8 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_hs__tap_2
 END LIBRARY
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
index 75d6cee..3c611bd 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tapmet1_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapmet1_2 ;
@@ -43,6 +40,10 @@
       LAYER met1 ;
         RECT 0.080000 0.425000 0.400000 0.685000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -77,6 +78,8 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_hs__tapmet1_2
 END LIBRARY
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
index 2323afe..7d23562 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tapvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvgnd_1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
index af7cd24..0a2ad94 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tapvgnd2_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvgnd2_1 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
index f090909..6afda6e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__tapvpwrvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvpwrvgnd_1 ;
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
index 11ed514..2c7ee1f 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor2_1 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
index a8a42ba..b5e0215 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor2_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
index 9d280f2..cc237c1 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor2_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
index 12e44d2..43f1231 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor3_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
index 3dec6ac..97c7786 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor3_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
index 5944bb8..b150ac3 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xnor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xnor3_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
index 611086a..4ff9343 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor2_1 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
index b160636..1e9984d 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor2_2 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
index 1b5f243..76e7ff9 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor2_4 ;
@@ -90,6 +87,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
index ae029ff..e73bb00 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor3_1 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
index 2458777..6f0bec5 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor3_2 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
index c1a236d..fee3e02 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hs__xor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hs__xor3_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;