diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
index 5cb91b2..554b84b 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
index 01219e5..6136e4d 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111o_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef
index 826a13d..94e81aa 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
index b88a86c..e5fc422 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111o_4 ;
@@ -97,6 +94,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.655000 8.350000 3.520000 ;
+        RECT  2.375000 1.565000 4.940000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
index 5e7b1e7..e3ed4a0 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111o_lp ;
@@ -92,6 +89,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
index bdf7dd7..0d5d241 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111o_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
index 05636b6..a5d87e4 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
index 918b4c2..7f0ae70 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
index 41bc76a..ab653d4 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
index f2d47e3..bb133f5 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_4 ;
@@ -107,6 +104,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
index ae12c3a..2a517ce 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
index 3deda25..5d71fb9 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2111oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2111oi_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
index aaebac2..41f8c16 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
index 0ba834f..16169c1 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_1 ;
@@ -81,6 +78,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
index 96de1e9..0e92731 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_2 ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
index 84a5f3e..96d246a 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_4 ;
@@ -95,6 +92,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
index 7edd823..3a602b0 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_lp ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
index 76a92bb..b1a85af 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211o_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
index e1260ea..64bd5d0 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211oi_0 ;
@@ -86,6 +83,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
index 5ebc0e7..34a5123 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211oi_1 ;
@@ -89,6 +86,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef
index 7037973..0f26643 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
index f300802..dcbdcee 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211oi_4 ;
@@ -99,6 +96,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
index 2857a40..e0ac12c 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211oi_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
index 598e97a..9f07be8 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a211oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a211oi_m ;
@@ -85,6 +82,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
index e98d84e..9a1d620 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
index 1db3ebd..22272a0 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
index c61378e..2252245 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_2 ;
@@ -72,6 +69,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
index 9850611..2ad0973 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_4 ;
@@ -81,6 +78,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
index 9d27f6b..4586f68 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
index fd7853c..ef5d2f8 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21bo_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21bo_m ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
index e371cdb..5f2a292 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
index b752b62..4f7b1af 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_1 ;
@@ -75,6 +72,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
index a31d792..c92e76c 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_2 ;
@@ -80,6 +77,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
index 70a766d..701b0c8 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_4 ;
@@ -85,6 +82,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
index 3cebd9b..f11e875 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
index f1c28c1..fce29bd 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21boi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21boi_m ;
@@ -72,6 +69,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
index ed12191..8ec2f0e 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef
index db348d5..16d8320 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
index 383e8f2..d9632da 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_2 ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef
index ebd19c9..6a40b70 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
index ed4194b..b302028 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_lp ;
@@ -73,6 +70,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
index a2bf0dc..3a84b66 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21o_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
index 94477d9..85dd690 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21oi_0 ;
@@ -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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef
index 3d90b17..eb5f245 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
index 7313551..cbded4a 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21oi_2 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef
index 03bc15f..b8581d9 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21oi_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
index 7888fe9..f8b6142 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21oi_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
index 45774bd..b587bf0 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a21oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a21oi_m ;
@@ -75,6 +72,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
index d84a66f..c6d0683 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
index 3f55944..a3bee5b 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
index 2c3e1f9..a5d6375 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_2 ;
@@ -90,6 +87,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
index 3112b75..6a5a240 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
index 2deb33e..0afceb6 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_lp ;
@@ -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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
index c668f90..6ba36ca 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221o_m ;
@@ -91,6 +88,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
index 1e7d317..a19d203 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef
index ef70f82..5246b63 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
index d27fb02..0195fc5 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
index b136b91..8d7c3c0 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_4 ;
@@ -110,6 +107,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
index 2e33ed3..ba828ed 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
index 2c1c0b9..cfa7056 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a221oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a221oi_m ;
@@ -97,6 +94,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
index 50ac799..b33d54a 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22o_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef
index 1060748..72bc578 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22o_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef
index 2acfd76..ccc86c6 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef
index 42fa69b..1557a0a 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22o_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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
index 0789c7b..49cda75 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22o_lp ;
@@ -87,6 +84,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
index 994d067..3dbfe3e 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22o_m ;
@@ -86,6 +83,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
index 9e6d1b7..be0630e 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_0 ;
@@ -84,6 +81,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef
index ad0edf9..c74efa0 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
index b174eba..2f0c729 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_2 ;
@@ -94,6 +91,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef
index 534ad9f..91a6480 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
index b1b1ab4..85925fe 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
index 6c241e8..ea0da32 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a22oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a22oi_m ;
@@ -84,6 +81,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
index cb672b0..1029117 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
index b1ff881..8e1e069 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef
index cf0281a..9cc4f5d 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
index 9a3dd27..685657a 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
index a9eaada..5847c08 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_lp ;
@@ -84,6 +81,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
index 222946f..070d9d9 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2o_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
index ca9ba6f..b2e2ba5 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef
index 8dcfc26..4b2f31d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
index e26b18a..126a197 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_2 ;
@@ -89,6 +86,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
index fa6c6f8..9041fbf 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_4 ;
@@ -96,6 +93,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
index ff83378..29f75d7 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_lp ;
@@ -84,6 +81,23 @@
         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.655000 4.510000 3.520000 ;
+        RECT  2.100000 1.515000 3.280000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
index 22de2ea..4c70bca 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a2bb2oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a2bb2oi_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
index 1776771..008f7a6 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
index 4f6f9de..f6c00c6 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311o_1 ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef
index caa6903..c0916bd 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
index df61433..2c2e06b 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311o_4 ;
@@ -95,6 +92,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.655000 7.870000 3.520000 ;
+        RECT  2.325000 1.595000 4.535000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
index 7bee515..ba50a0a 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311o_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
index 6fbfb4d..85f16c2 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311o_m ;
@@ -90,6 +87,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
index d08ae4b..7c848cb 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311oi_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef
index 16f8479..9d49c8e 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
index f4ac71b..26289ac 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311oi_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
index 469200e..2e6ee04 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311oi_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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
index a7a4669..9ad156f 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311oi_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
index 2695e59..e5cab9d 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a311oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a311oi_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
index 98e01a1..73a066c 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31o_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef
index 06a4c8f..6ecdb57 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31o_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef
index 88aceef..c4914c7 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
index bf45538..a955491 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31o_4 ;
@@ -84,6 +81,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
index 7fd2457..cc2c0f0 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31o_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
index 5c89f1a..3961bf6 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31o_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
index 6ac0111..6e09987 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31oi_0 ;
@@ -84,6 +81,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef
index 2bb1027..4ec795d 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
index 546fdda..f23c286 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31oi_2 ;
@@ -87,6 +84,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef
index 1d1b5ab..38e6e6b 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31oi_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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
index 7a77f4f..da9d6bf 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31oi_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
index e920bde..7cec488 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a31oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a31oi_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
index 99692cc..861c565 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
index cbd8422..1aba3a4 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_1 ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
index 7624566..b3a66e8 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
index 2da15fd..df80611 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_4 ;
@@ -97,6 +94,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
index fdb0030..6bca1c3 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_lp ;
@@ -90,6 +87,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
index 75e90f4..068483b 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32o_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
index 221a783..9b37d8b 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32oi_0 ;
@@ -91,6 +88,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef
index 3abcfa5..269b7de 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef
index 832739a..9b9c516 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
index 8a928ae..9281dba 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32oi_4 ;
@@ -96,6 +93,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
index d7638b0..d9c2c87 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32oi_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
index 7f40db2..d434f84 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a32oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a32oi_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
index dfc1dd2..e758c86 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
index bad7c35..0ba67eb 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_1 ;
@@ -90,6 +87,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
index 7e0e5ae..b69e2f5 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_2 ;
@@ -90,6 +87,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
index 1ab8559..194c881 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_4 ;
@@ -96,6 +93,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
index ab83c5d..20b4485 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
index a4c0693..da94797 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41o_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41o_m ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
index 0313662..4bafd29 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_0 ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
index 2b26ce1..dc8585f 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_1 ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
index 5c17171..7e6de8b 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_2 ;
@@ -98,6 +95,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
index 9ac24b9..1cb4cd8 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_4 ;
@@ -105,6 +102,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
index 7fe37a5..f673947 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_lp ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
index 0ec6255..04c4f33 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__a41oi_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__a41oi_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
index 9636e43..c63c9a4 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_0 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
index 8a339cb..cd8c731 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_1 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
index 3009c16..9e2d68f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_2 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
index 895b1be..aee4fa9 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_4 ;
@@ -69,6 +66,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
index 7b9bd88..59d95b6 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_lp ;
@@ -63,6 +60,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
index 91c73ce..b424374 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_lp2 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
index 535d05f..71b3966 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2_m ;
@@ -63,6 +60,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
index e26443c..528a820 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2b_1 ;
@@ -64,6 +61,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
index 171034e..fb29317 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2b_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
index d9f2c04..f8106c4 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2b_4 ;
@@ -67,6 +64,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
index fb7c59e..a7eb7cb 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2b_lp ;
@@ -63,6 +60,24 @@
         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.655000 1.200000 1.685000 ;
+        RECT -0.190000 1.685000 3.550000 3.520000 ;
+        RECT  2.470000 1.655000 3.550000 1.685000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
index 7af871f..1acb437 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and2b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and2b_m ;
@@ -63,6 +60,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
index bc779df..01dc4e7 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef
index d0f47c2..61620b0 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
index 6fc045f..ab3a504 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3_2 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
index 625302a..3c3b79d 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3_4 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
index 032d1d3..b56f691 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
index a1e4d60..a975f3c 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3_m ;
@@ -72,6 +69,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
index 4199220..970f79c 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3b_1 ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
index d79848c..fcde575 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3b_2 ;
@@ -72,6 +69,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
index 324e092..8c49509 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3b_4 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
index 70a1468..ee9f66b 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3b_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
index 49f8f2e..49848e5 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and3b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and3b_m ;
@@ -72,6 +69,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
index 5f78549..c413513 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
index 20ef5ec..21690ea 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
index f1f89c4..f1fa0d6 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_2 ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
index 9342b5d..ed0f52b 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_4 ;
@@ -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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
index 1843860..1e2fdba 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_lp ;
@@ -82,6 +79,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
index 1770b00..dd04f0b 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_lp2 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
index ab8f765..ff42bdc 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4_m ;
@@ -81,6 +78,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
index e8e2c28..59e52f9 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4b_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
index a91d179..95a0545 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4b_2 ;
@@ -85,6 +82,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
index 066af91..7982e61 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4b_4 ;
@@ -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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
index 6bbacc0..6b408cd 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4b_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
index cecb9d3..2277573 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4b_m ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef
index fe27138..b58570d 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4bb_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
index 848c4b6..865c22e 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4bb_2 ;
@@ -82,6 +79,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
index 891235a..805f52f 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4bb_4 ;
@@ -85,6 +82,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
index 9237968..97d3ac9 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4bb_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4bb_lp ;
@@ -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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
index ac4f3d3..3fc42be 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__and4bb_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__and4bb_m ;
@@ -82,6 +79,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
index ecf779d..5b692e7 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_0 ;
@@ -57,6 +54,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
index ab01786..a2bab29 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_1 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
index e6582b6..14a8353 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_16 ;
@@ -55,6 +52,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef
index 0f5e26c..d5e79e4 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef
index e3b67a7..156699a 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef
index 646ec22..ad9eff7 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
index 7392024..ad8dbe7 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_lp ;
@@ -56,6 +53,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
index e1f08d3..c20b090 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buf_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buf_m ;
@@ -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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
index bae4149..955fdb7 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufbuf_16 ;
@@ -54,6 +51,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.655000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef
index fe04357..9fe3071 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
index 70eb057..8cc89c0 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufinv_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.655000 11.710000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
index bfe0c36..62e4f1f 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufinv_8 ;
@@ -65,6 +62,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
index 08b6ae8..6a93eca 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufkapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufkapwr_1 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
index 380db3d..988f196 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufkapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufkapwr_2 ;
@@ -66,6 +63,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
index 126fe17..8fcd9af 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufkapwr_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufkapwr_4 ;
@@ -68,6 +65,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
index bbe5c5f..be91b95 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bufkapwr_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bufkapwr_8 ;
@@ -72,6 +69,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
index 1703748..1af0203 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_0 ;
@@ -54,6 +51,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
index adb1123..008aa28 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_1 ;
@@ -54,6 +51,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
index c424553..b498672 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_2 ;
@@ -56,6 +53,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
index 9a77b00..c760d26 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_4 ;
@@ -61,6 +58,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
index 051e034..d605123 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_8 ;
@@ -65,6 +62,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
index f77e812..cbc01df 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__buflp_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__buflp_m ;
@@ -54,6 +51,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
index d099333..8755a80 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busdriver_20
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busdriver_20 ;
@@ -44,6 +41,19 @@
         RECT 0.115000 1.180000 0.445000 1.515000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 24.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 25.150000 3.520000 ;
+        RECT 11.730000 1.345000 20.980000 1.655000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  5.250200 ;
     USE SIGNAL ;
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
index f5022b5..d0f5f19 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busdriver2_20
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busdriver2_20 ;
@@ -44,6 +41,19 @@
         RECT 0.115000 1.180000 0.445000 1.515000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 24.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 25.150000 3.520000 ;
+        RECT 11.730000 1.345000 20.980000 1.655000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  5.250200 ;
     USE SIGNAL ;
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
index 53a936e..f3bd85c 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busdrivernovlp_20
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busdrivernovlp_20 ;
@@ -75,6 +72,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.655000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
index 068e4f7..1bb73d3 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busdrivernovlp2_20
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busdrivernovlp2_20 ;
@@ -56,6 +53,18 @@
         RECT 5.815000 0.995000 6.215000 1.325000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  4.968000 ;
     USE SIGNAL ;
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
index 9801ff4..05b3c58 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busdrivernovlpsleep_20
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busdrivernovlpsleep_20 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 23.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 23.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 23.710000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef b/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
index 6a63923..10a33ef 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bushold_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bushold_1 ;
@@ -58,6 +55,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
index c75d421..9b7a72b 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__bushold0_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__bushold0_1 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
index 052e3b0..968fd14 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busreceiver_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busreceiver_0 ;
@@ -57,6 +54,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
index 7d5b859..c966430 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busreceiver_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busreceiver_1 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
index d1153e0..8a107f1 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__busreceiver_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__busreceiver_m ;
@@ -36,6 +33,18 @@
         RECT 0.635000 0.840000 0.875000 1.750000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.222600 ;
     USE SIGNAL ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
index 9871f6d..0073688 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuf_0 ;
@@ -57,6 +54,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
index 077611a..5064248 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuf_1 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
index 7bfb2ca..36332df 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
index 4f128c9..d76f4ba 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuf_2 ;
@@ -58,6 +55,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef
index ee80313..eb596b1 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
index a349432..b5fdea8 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuf_8 ;
@@ -64,6 +61,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
index b6f71d4..27d609a 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuf_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuf_lp ;
@@ -56,6 +53,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
index 970deda..f6e062f 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuflp_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuflp_16 ;
@@ -55,6 +52,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.655000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
index 330c4fc..7033ef8 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuflp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuflp_2 ;
@@ -56,6 +53,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
index 3bef851..bb79bb4 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuflp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuflp_4 ;
@@ -61,6 +58,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
index 0fd5104..d581ad9 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkbuflp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkbuflp_8 ;
@@ -67,6 +64,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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef
index dbdf190..4a45b2a 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s15_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s15_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
index f1bd1ba..24fc596 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s15_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s15_2 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef
index 558f435..df6f758 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s18_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s18_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
index 916efe0..ae820c6 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s18_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s18_2 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef
index 8cd3aad..d15b13f 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s25_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s25_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
index 6a8c8e8..289a00b 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s25_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s25_2 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef
index b78ff10..77830bf 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s50_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s50_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
index 7264a54..58ea1b6 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkdlybuf4s50_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkdlybuf4s50_2 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
index 796d091..07fffc7 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_0 ;
@@ -55,6 +52,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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
index 978ac6f..b0c95f1 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_1 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
index 891934b..39f709a 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_16 ;
@@ -54,6 +51,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.655000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef
index 83dde20..44485a4 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef
index 416eca6..b01897d 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
index d608605..ec84a6f 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_8 ;
@@ -67,6 +64,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
index 9583645..3669ea9 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_lp ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
index 80515c7..70e8fe3 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinv_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinv_lp2 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
index 0bdaff7..54ac9ca 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinvlp_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinvlp_16 ;
@@ -54,6 +51,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
index 3318632..456befb 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinvlp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinvlp_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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
index f2a247b..baf0de7 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinvlp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinvlp_4 ;
@@ -58,6 +55,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
index 2aa6698..b2a0b50 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__clkinvlp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__clkinvlp_8 ;
@@ -61,6 +58,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef b/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
index 5d27157..ea07a3d 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__conb_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__conb_0 ;
@@ -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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef b/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
index 585f375..dfe4a40 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__conb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__conb_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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
index 7fdcbb6..67e0e2a 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decap_12
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decap_12 ;
@@ -28,6 +25,18 @@
   SIZE  5.760000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
index d4e5718..895e750 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decap_3
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decap_3 ;
@@ -28,6 +25,18 @@
   SIZE  1.440000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
index 6725b8c..1eac5ec 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decap_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decap_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
index e3396ca..aec7f66 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decap_6
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decap_6 ;
@@ -28,6 +25,18 @@
   SIZE  2.880000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
index c9a5445..be89916 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decap_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decap_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
index 5330623..16b38ed 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decapkapwr_12
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decapkapwr_12 ;
@@ -28,6 +25,18 @@
   SIZE  5.760000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
index f634503..4f5bf5e 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decapkapwr_3
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decapkapwr_3 ;
@@ -28,6 +25,18 @@
   SIZE  1.440000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
index 486f8e1..ed3fab9 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decapkapwr_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decapkapwr_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
index bb2af99..e85a9e2 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decapkapwr_6
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decapkapwr_6 ;
@@ -28,6 +25,18 @@
   SIZE  2.880000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
index 3c384cf..c739090 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__decapkapwr_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__decapkapwr_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
index 185743b..7b2187e 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfbbn_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.655000 14.110000 3.520000 ;
+        RECT 10.910000 1.535000 12.475000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
index 15e3096..39eab77 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfbbn_2 ;
@@ -100,6 +97,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.655000 15.070000 3.520000 ;
+        RECT 10.975000 1.530000 13.000000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
index 53f451a..1200005 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfbbp_1 ;
@@ -98,6 +95,25 @@
         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.655000  8.385000 1.970000 ;
+        RECT -0.190000 1.970000 13.150000 3.520000 ;
+        RECT  9.655000 1.535000 11.495000 1.655000 ;
+        RECT  9.655000 1.655000 13.150000 1.970000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
index de8458c..3c97b30 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrbp_1 ;
@@ -92,6 +89,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.655000  1.315000 1.715000 ;
+        RECT -0.190000 1.715000 11.710000 3.520000 ;
+        RECT  5.250000 1.655000 11.710000 1.715000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
index e8ef9b3..dca20a8 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrbp_2 ;
@@ -88,6 +85,26 @@
         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.655000  1.245000 1.715000 ;
+        RECT -0.190000 1.715000 12.190000 3.520000 ;
+        RECT  5.245000 1.700000 12.190000 1.715000 ;
+        RECT  7.200000 1.460000 10.015000 1.655000 ;
+        RECT  7.200000 1.655000 12.190000 1.700000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
index a5feb3d..e52464e 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrbp_lp ;
@@ -87,6 +84,23 @@
         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.655000 18.430000 3.520000 ;
+        RECT  7.490000 1.375000  8.475000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
index 6292201..2685264 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrtn_1 ;
@@ -80,6 +77,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
index dbfee7e..00a8acf 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrtp_1 ;
@@ -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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
index 2324aa7..a352839 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrtp_2 ;
@@ -79,6 +76,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.655000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
index 2081caf..813fd43 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfrtp_4 ;
@@ -85,6 +82,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.655000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
index 416855c..0841005 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfsbp_1 ;
@@ -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.655000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
index f642cb2..d4006c2 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfsbp_2 ;
@@ -87,6 +84,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.655000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
index 7bdf23b..b43813c 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfsbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfsbp_lp ;
@@ -90,6 +87,22 @@
         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.655000 14.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
index 60508f5..a6c504f 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfstp_1 ;
@@ -78,6 +75,23 @@
         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.655000 10.750000 3.520000 ;
+        RECT  8.030000 1.425000  9.070000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
index 0a72ebf..c01dee5 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfstp_2 ;
@@ -79,6 +76,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.655000 11.230000 3.520000 ;
+        RECT  8.145000 1.445000  9.185000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
index 35c43fc..3521bf7 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfstp_4 ;
@@ -82,6 +79,23 @@
         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.655000 12.670000 3.520000 ;
+        RECT  8.815000 1.495000  9.855000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
index 361d4da..c548239 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfstp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfstp_lp ;
@@ -78,6 +75,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.655000 13.630000 3.520000 ;
+        RECT 10.325000 1.515000 11.675000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
index bb40c45..cdcc96a 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxbp_1 ;
@@ -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.655000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
index 87c56f5..f941aaf 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxbp_2 ;
@@ -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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
index 6cd815c..4ca7d01 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxbp_lp ;
@@ -74,6 +71,25 @@
         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.655000 13.150000 3.520000 ;
+        RECT  1.565000 1.435000  3.270000 1.555000 ;
+        RECT  1.565000 1.555000  5.980000 1.655000 ;
+        RECT  4.800000 1.525000  5.980000 1.555000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
index d8ce78d..c43ac44 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxtp_1 ;
@@ -63,6 +60,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
index 6c0721f..806af31 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxtp_2 ;
@@ -63,6 +60,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.655000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
index bd30829..7be5ad2 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxtp_4 ;
@@ -72,6 +69,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.655000 9.310000 3.520000 ;
+        RECT  5.870000 1.545000 6.910000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
index e82e7d3..8bee9be 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dfxtp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dfxtp_lp ;
@@ -64,6 +61,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.655000 11.230000 3.520000 ;
+        RECT  2.380000 1.525000  7.000000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
index 0933245..8321c43 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__diode_0
   CLASS CORE ANTENNACELL ;
   FOREIGN sky130_fd_sc_lp__diode_0 ;
@@ -36,6 +33,18 @@
         RECT 0.090000 0.255000 0.870000 3.075000 ;
     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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
index caa0d93..b352258 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__diode_1
   CLASS CORE ANTENNACELL ;
   FOREIGN sky130_fd_sc_lp__diode_1 ;
@@ -36,6 +33,18 @@
         RECT 0.090000 0.255000 0.870000 3.075000 ;
     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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef
index f3ff5b2..a228c77 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlclkp_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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
index 4a2d7f5..4c4e315 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlclkp_2 ;
@@ -63,6 +60,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.655000 7.390000 3.520000 ;
+        RECT  3.685000 1.425000 4.525000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
index 071af33..8a3a849 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlclkp_4 ;
@@ -69,6 +66,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.655000 8.350000 3.520000 ;
+        RECT  3.850000 1.590000 4.690000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
index e89c6dc..6161528 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlclkp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlclkp_lp ;
@@ -65,6 +62,25 @@
         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.655000 3.840000 1.915000 ;
+        RECT -0.190000 1.915000 7.390000 3.520000 ;
+        RECT  5.205000 1.685000 7.390000 1.915000 ;
+        RECT  6.535000 1.655000 7.390000 1.685000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
index b85b1a4..f699443 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbn_1 ;
@@ -84,6 +81,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.655000 9.790000 3.520000 ;
+        RECT  1.190000 1.615000 2.815000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
index 17d791e..a273ee9 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbn_2 ;
@@ -83,6 +80,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.655000 9.790000 3.520000 ;
+        RECT  0.975000 1.615000 5.305000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
index 7d5633a..77c98f4 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbn_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbn_lp ;
@@ -85,6 +82,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
index 6a26508..fc5815b 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbp_1 ;
@@ -83,6 +80,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.655000 8.350000 3.520000 ;
+        RECT  4.385000 1.605000 6.380000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
index d128a04..1689384 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbp_2 ;
@@ -86,6 +83,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
index 67b7be8..7531236 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrbp_lp ;
@@ -85,6 +82,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.655000 10.270000 3.520000 ;
+        RECT  2.135000 1.495000  7.650000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef
index 8ec93ee..40e8bf9 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtn_1 ;
@@ -74,6 +71,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
index 5008962..4ad2866 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtn_2 ;
@@ -74,6 +71,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
index df38a7a..f30ad67 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtn_4 ;
@@ -79,6 +76,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.655000 7.870000 3.520000 ;
+        RECT  1.375000 1.645000 2.215000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
index 67f8e9e..5975a82 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtn_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtn_lp ;
@@ -73,6 +70,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
index e3aa0f2..ff2a624 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtp_1 ;
@@ -75,6 +72,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
index df5930e..2da2d2c 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtp_2 ;
@@ -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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
index e0d8460..81ccafa 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtp_4 ;
@@ -81,6 +78,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
index ed8cae5..9bbbc1a 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtp_lp ;
@@ -73,6 +70,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.655000 10.750000 3.520000 ;
+        RECT  1.305000 1.545000  5.445000 1.655000 ;
+        RECT  3.820000 1.535000  5.445000 1.545000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
index c1e9d3d..d406891 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlrtp_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlrtp_lp2 ;
@@ -73,6 +70,24 @@
         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.655000 0.730000 1.845000 ;
+        RECT -0.190000 1.845000 7.870000 3.520000 ;
+        RECT  2.455000 1.655000 7.870000 1.845000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
index 8f666c5..fcc9d2c 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxbn_1 ;
@@ -73,6 +70,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.655000 8.350000 3.520000 ;
+        RECT  0.835000 1.545000 1.675000 1.635000 ;
+        RECT  0.835000 1.635000 6.980000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
index 9a4761d..e755214 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxbn_2 ;
@@ -73,6 +70,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.655000 8.830000 3.520000 ;
+        RECT  0.880000 1.585000 1.720000 1.605000 ;
+        RECT  0.880000 1.605000 5.405000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef
index 24eb9be..1d109dd 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxbp_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.655000 7.870000 3.520000 ;
+        RECT  3.900000 1.595000 5.300000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
index bdfbed0..4e205aa 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxbp_lp ;
@@ -76,6 +73,24 @@
         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.655000 10.270000 3.520000 ;
+        RECT  1.480000 1.365000  2.470000 1.625000 ;
+        RECT  1.480000 1.625000  8.800000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
index 02ac0c3..60b3518 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxbp_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxbp_lp2 ;
@@ -76,6 +73,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.655000 10.270000 3.520000 ;
+        RECT  2.260000 1.515000  6.765000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef
index 4643103..cba60b4 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtn_1 ;
@@ -63,6 +60,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.655000 6.910000 3.520000 ;
+        RECT  4.760000 1.565000 5.800000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
index 23ff692..2b377ba 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtn_2 ;
@@ -63,6 +60,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.655000 7.390000 3.520000 ;
+        RECT  4.795000 1.500000 5.855000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
index 20eccec..fee41d0 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtn_4 ;
@@ -69,6 +66,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.655000 7.870000 3.520000 ;
+        RECT  4.445000 1.575000 5.485000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
index 887cc8d..d1dbff2 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtp_1 ;
@@ -63,6 +60,23 @@
         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.655000 5.950000 3.520000 ;
+        RECT  3.455000 1.495000 4.855000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
index 1ab7e28..a77013d 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtp_lp ;
@@ -63,6 +60,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
index 7cfefb7..907bc06 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlxtp_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlxtp_lp2 ;
@@ -64,6 +61,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
index f78ad8f..80780bc 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s15kapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s15kapwr_1 ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
index 23c6392..605f10d 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s15kapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s15kapwr_2 ;
@@ -64,6 +61,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
index 7c4311e..466c3e8 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s18kapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s18kapwr_1 ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
index 50ab05b..ac17839 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s18kapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s18kapwr_2 ;
@@ -64,6 +61,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
index e4786eb..564a432 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s25kapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s25kapwr_1 ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
index a69ddda..9d6d64c 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s25kapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s25kapwr_2 ;
@@ -64,6 +61,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
index f6896fa..6501f2f 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s50kapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s50kapwr_1 ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
index 5122e98..bb9aa7c 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlybuf4s50kapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlybuf4s50kapwr_2 ;
@@ -64,6 +61,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef
index cbc4ddc..a99f9cf 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlygate4s15_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlygate4s15_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef
index 7f5a75d..ec35c67 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlygate4s18_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlygate4s18_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef
index 2df0fb7..d6647f8 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlygate4s50_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlygate4s50_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
index 3eb0157..256e58e 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlymetal6s2s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlymetal6s2s_1 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
index 6884fbf..c48d130 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlymetal6s4s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlymetal6s4s_1 ;
@@ -56,6 +53,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
index 0f047f8..4bc4136 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__dlymetal6s6s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__dlymetal6s6s_1 ;
@@ -55,6 +52,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
index 4264643..dbc6246 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ebufn_1 ;
@@ -65,6 +62,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef
index 530c552..f3d0d74 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
index cb6359b..be9d3bf 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ebufn_4 ;
@@ -72,6 +69,23 @@
         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.655000 6.430000 3.520000 ;
+        RECT  4.315000 1.605000 5.155000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
index f854930..7728a5a 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ebufn_8 ;
@@ -75,6 +72,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.655000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
index 987f654..539b2c1 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ebufn_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
index a5757c2..b783df5 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ebufn_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ebufn_lp2 ;
@@ -66,6 +63,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.655000 1.350000 1.915000 ;
+        RECT -0.190000 1.915000 4.030000 3.520000 ;
+        RECT  2.715000 1.655000 4.030000 1.915000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
index c640c23..beeb0d8 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__edfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__edfxbp_1 ;
@@ -85,6 +82,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.655000 14.590000 3.520000 ;
+        RECT 11.875000 1.635000 13.475000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
index 99c5c73..2743fbf 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_0 ;
@@ -63,6 +60,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
index f8b20db..4683b8c 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef
index 2c06089..46a28a5 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
index bf64388..24c7f83 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
index 2474fda..413ced2 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_8 ;
@@ -74,6 +71,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
index b881450..467b80f 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
index 356e57d..9228326 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvn_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvn_m ;
@@ -63,6 +60,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
index 918b4c8..bc8baf7 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_0 ;
@@ -66,6 +63,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
index eae94d3..7c5a45f 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
index 1243cae..0b4fb57 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_2 ;
@@ -63,6 +60,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
index 8b11c9a..8ca78e0 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_4 ;
@@ -73,6 +70,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef
index b7579ef..99b9e0f 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
index 3661477..8e6a6a3 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
index b40b44c..0cafa64 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__einvp_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__einvp_m ;
@@ -63,6 +60,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
index 89c269e..d8f8027 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_0 ;
@@ -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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
index 3dff918..9113781 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_1 ;
@@ -94,6 +91,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
index 2a62b9a..7756ab0 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_2 ;
@@ -102,6 +99,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
index c196a06..185db91 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_4 ;
@@ -103,6 +100,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.655000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
index e28d674..70f0f44 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_lp ;
@@ -98,6 +95,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
index 76df8ce..0783e32 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fa_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fa_m ;
@@ -88,6 +85,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.655000 7.870000 3.520000 ;
+        RECT  2.325000 1.595000 3.465000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef b/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
index af2de1e..9c2b234 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fah_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fah_1 ;
@@ -89,6 +86,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.655000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
index 0e7622c..e187374 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fahcin_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fahcin_1 ;
@@ -85,6 +82,24 @@
         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.655000  1.155000 1.855000 ;
+        RECT -0.190000 1.855000 12.670000 3.520000 ;
+        RECT  2.425000 1.655000 12.670000 1.855000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
index d2ae65b..83d7f4f 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fahcon_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__fahcon_1 ;
@@ -85,6 +82,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.655000 11.710000 3.520000 ;
+        RECT  1.830000 1.615000  5.055000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
index 90cf7f1..c2999d0 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fill_1
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__fill_1 ;
@@ -28,6 +25,18 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
index 28f6684..3324c48 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fill_2
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__fill_2 ;
@@ -28,6 +25,18 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
index d340c9f..8ce3bfc 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fill_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__fill_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
index e22e1c1..86ce0c3 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__fill_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_lp__fill_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
+  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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
index e17c6be..4db083d 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_0 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
index 75779f5..71e6388 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_1 ;
@@ -77,6 +74,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
index cbc379b..20980cd 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_2 ;
@@ -74,6 +71,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
index 734d23f..984ee72 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_4 ;
@@ -96,6 +93,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
index 22a7196..8b7467d 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_lp ;
@@ -79,6 +76,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
index 12b7e85..a96a54a 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__ha_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__ha_m ;
@@ -74,6 +71,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
index 15986ec..d7e336f 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inputiso0n_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inputiso0n_lp ;
@@ -63,6 +60,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.655000 3.545000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
index fd85ad8..71775c8 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inputiso0p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inputiso0p_lp ;
@@ -63,6 +60,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.655000 4.025000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
index b3a0150..fe11fa3 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inputiso1n_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inputiso1n_lp ;
@@ -63,6 +60,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.220000 1.655000 4.025000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
index 7b96140..56ee0c3 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inputiso1p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inputiso1p_lp ;
@@ -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.655000 3.545000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
index 688e24d..a23fd72 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inputisolatch_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inputisolatch_lp ;
@@ -65,6 +62,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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
index ce41381..0589b43 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_0 ;
@@ -54,6 +51,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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
index 26b9061..a0fa26a 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_1 ;
@@ -54,6 +51,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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
index 2e6392b..c43e88e 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_16 ;
@@ -33,6 +30,39 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met1 ;
+        RECT 1.050000 1.550000 6.500000 1.780000 ;
+    END
+  END A
+  PIN Y
+    ANTENNADIFFAREA  4.704000 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met1 ;
+        RECT 0.620000 1.920000 6.930000 2.150000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        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 li1 ;
         RECT 0.000000 3.245000 7.680000 3.415000 ;
         RECT 0.170000 1.920000 0.465000 3.245000 ;
@@ -62,28 +92,7 @@
         RECT 6.875000 3.245000 7.045000 3.415000 ;
         RECT 7.355000 3.245000 7.525000 3.415000 ;
     END
-    PORT
-      LAYER met1 ;
-        RECT 1.050000 1.550000 6.500000 1.780000 ;
-    END
-  END A
-  PIN Y
-    ANTENNADIFFAREA  4.704000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.620000 1.920000 6.930000 2.150000 ;
-    END
-  END Y
-  PIN VGND
-    DIRECTION INOUT ;
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.245000 7.680000 0.245000 ;
-    END
-  END VGND
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
index 18c4bb6..78e459f 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_2 ;
@@ -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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
index 218713f..02f8fd2 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_4 ;
@@ -61,6 +58,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
index 43c3098..42a9794 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_8 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
index 1818dbc..52dd0cc 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_lp ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
index 0eff459..706a2ed 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__inv_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__inv_m ;
@@ -55,6 +52,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.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
index bf5bcdd..fcf4047 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invkapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invkapwr_1 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
index 9b45845..aebaac2 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invkapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invkapwr_2 ;
@@ -67,6 +64,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
index eff5b4f..a7c3172 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invkapwr_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invkapwr_4 ;
@@ -70,6 +67,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
index c37dcad..7a3f135 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invkapwr_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invkapwr_8 ;
@@ -75,6 +72,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
index 9774840..9b06a16 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_0 ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef
index 91dcb7e..913ad3f 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
index 8e7d496..3dc03e6 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_2 ;
@@ -54,6 +51,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
index c7dd017..76e885f 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_4 ;
@@ -64,6 +61,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
index 969ecb1..f86ec01 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_8 ;
@@ -69,6 +66,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
index ff8feb4..32445f9 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__invlp_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__invlp_m ;
@@ -56,6 +53,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
index dcf68d9..d5dc0f6 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso0n_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso0n_lp ;
@@ -70,6 +67,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.655000 3.545000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
index 67612ef..d494e43 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso0n_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso0n_lp2 ;
@@ -72,6 +69,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
index 5d4809e..6795067 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso0p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso0p_lp ;
@@ -71,6 +68,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.655000 4.025000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
index a6ea104..37cb022 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso0p_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso0p_lp2 ;
@@ -71,6 +68,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.655000 4.025000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
index 897b078..f9fa273 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso1n_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso1n_lp ;
@@ -70,6 +67,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.220000 1.655000 4.025000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
index 282c522..856852f 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso1n_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso1n_lp2 ;
@@ -72,6 +69,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
index 9a39f2d..6e2181f 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso1p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso1p_lp ;
@@ -72,6 +69,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.655000 3.545000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
index 36d21fb..9ca9ede 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__iso1p_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__iso1p_lp2 ;
@@ -73,6 +70,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef
index 56ca045..a874450 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__isobufsrc_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__isobufsrc_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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
index 320d186..099ce2c 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__isobufsrc_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__isobufsrc_2 ;
@@ -70,6 +67,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
index 3818994..98e3b95 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__isobufsrc_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__isobufsrc_4 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
index 8b402b4..84f55a8 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__isolatch_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__isolatch_lp ;
@@ -73,6 +70,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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
index 17fa928..456e6ad 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__lsbuf_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__lsbuf_lp ;
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
index bde2a8e..ef16064 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__lsbufiso0p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__lsbufiso0p_lp ;
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
index 96f8a3f..9728416 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__lsbufiso1p_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__lsbufiso1p_lp ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
index 6be53ed..c7a018c 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
index 56bcc9a..46b0c8e 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
index d70297e..5c72e1c 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_2 ;
@@ -76,6 +73,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
index 3657558..1a8f086 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_4 ;
@@ -82,6 +79,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
index 211b391..839bee2 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_lp ;
@@ -78,6 +75,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
index e459443..bf5fb68 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__maj3_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__maj3_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
index 2bff8a4..e642a56 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_0 ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
index eb2a0fc..35cd3f9 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_1 ;
@@ -76,6 +73,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef
index f48b8da..2239622 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef
index a7a3c49..ec0c044 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
index 16f7ff5..6dfe6c5 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_8 ;
@@ -93,6 +90,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.655000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
index ede310a..1c5a77a 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_lp ;
@@ -76,6 +73,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
index 5ddb8e4..265a412 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_lp2 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
index 4f571ae..b80bfa5 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
index a9e6db1..1057fe8 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
index a43dcf4..b54a8eb 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
index ab1cacb..dbec659 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_2 ;
@@ -84,6 +81,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
index ca39039..84fc067 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_4 ;
@@ -86,6 +83,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.655000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef
index e76b307..5e991fb 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
index bbb00dd..55c3d50 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_lp2 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
index 8b6ff2a..47cfcac 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux2i_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux2i_m ;
@@ -86,6 +83,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
index 3eb1039..b16cceb 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_0 ;
@@ -102,6 +99,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
index 1f82f57..ce028d5 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_1 ;
@@ -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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
index db0929c..c363ef7 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_2 ;
@@ -99,6 +96,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.655000 8.830000 3.520000 ;
+        RECT  1.425000 1.595000 3.855000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
index 3518fa7..fca0625 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_4 ;
@@ -105,6 +102,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.655000 9.790000 3.520000 ;
+        RECT  1.655000 1.495000 4.865000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
index c6e9f91..f71d1d0 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_lp ;
@@ -113,6 +110,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.655000 10.270000 3.520000 ;
+        RECT  2.815000 1.495000  3.655000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
index 6271366..b35fd00 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__mux4_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__mux4_m ;
@@ -100,6 +97,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
index 430cbf9..4cfc4ed 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_0 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
index 74312b3..266b296 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_1 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef
index ac02609..34254b1 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
index 6b95409..d30d631 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
index 5c6df3c..b472701 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_8 ;
@@ -89,6 +86,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
index ec5fe1a..445207d 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_lp ;
@@ -45,6 +42,18 @@
         RECT 0.105000 0.955000 0.400000 2.890000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.237300 ;
     USE SIGNAL ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
index 356a3a6..9349a66 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_lp2 ;
@@ -67,6 +64,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
index dbbdbfc..77738bf 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2_m ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef
index e5348cf..4df8de6 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
index cf9a4fa..696a660 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2b_2 ;
@@ -72,6 +69,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
index 477542d..4c2ccd4 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2b_4 ;
@@ -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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
index b76dce7..fd2ea2e 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2b_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
index 4a353ab..2b0de47 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand2b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand2b_m ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
index 122f8b5..fc3278e 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_0 ;
@@ -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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef
index 4ec8d71..e7d3318 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
index c773ea8..f09a116 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_2 ;
@@ -81,6 +78,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
index 74484a2..b77f199 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_4 ;
@@ -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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef
index 76d4e76..4a42558 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
index 188ae0c..db8ff66 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3_m ;
@@ -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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
index 3926a64..2b012b9 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3b_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef
index a584a82..5e2184f 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3b_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
index f413086..f909e9b 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3b_4 ;
@@ -86,6 +83,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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
index be3a4ae..3dc94bf 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3b_lp ;
@@ -77,6 +74,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
index 6603c12..3e959f8 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand3b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand3b_m ;
@@ -76,6 +73,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
index 3744b35..233031f 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
index 7265d2a..aed9d81 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
index bfc38c7..7b1b714 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
index 3a35c09..52d219d 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_4 ;
@@ -95,6 +92,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
index bb882b9..1515c9a 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
index 271624b..3b4c155 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
index 633ce1c..945b710 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4b_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
index 423d8e0..2f5a052 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4b_2 ;
@@ -89,6 +86,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
index e78b030..eeee4e4 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4b_4 ;
@@ -103,6 +100,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
index ce2b757..35605c5 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4b_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
index 9790d68..cf327dd 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4b_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
index fd44382..2de6574 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4bb_1 ;
@@ -85,6 +82,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
index 8c7d1a3..ad9f781 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4bb_2 ;
@@ -91,6 +88,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
index 44d1e26..2a9a346 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4bb_4 ;
@@ -94,6 +91,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
index a739c0a..e649989 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4bb_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4bb_lp ;
@@ -88,6 +85,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
index 90d87c8..49bed05 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nand4bb_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nand4bb_m ;
@@ -87,6 +84,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
index 23e49d3..463ff93 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_0 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
index c94280b..e6ec4bd 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_1 ;
@@ -64,6 +61,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
index fbe9721..429335f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_2 ;
@@ -69,6 +66,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
index 92e6d71..8f85fcf 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_4 ;
@@ -75,6 +72,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
index 1cf0299..f3d7ba4 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_8 ;
@@ -83,6 +80,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
index 2538262..f8ce2ac 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_lp ;
@@ -59,6 +56,15 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.245000 2.400000 0.245000 ;
+        RECT 0.000000  0.245000 0.500000 0.500000 ;
+    END
+  END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 2.400000 0.085000 ;
         RECT 0.195000  0.085000 0.525000 1.000000 ;
@@ -70,15 +76,6 @@
         RECT 1.595000 -0.085000 1.765000 0.085000 ;
         RECT 2.075000 -0.085000 2.245000 0.085000 ;
     END
-  END VGND
-  PIN VNB
-    DIRECTION INOUT ;
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.245000 2.400000 0.245000 ;
-        RECT 0.000000  0.245000 0.500000 0.500000 ;
-    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
index 7a91b72..6c4fcf7 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_lp2 ;
@@ -63,6 +60,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
index 844a229..81095a2 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2_m ;
@@ -65,6 +62,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.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef
index cdcc714..1ebdd1b 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
index 123759d..a546352 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2b_2 ;
@@ -70,6 +67,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
index d91f5e1..7437975 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2b_4 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
index 4b410ee..2df22df 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2b_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
index 3520491..c0a4433 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor2b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor2b_m ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
index bbaed46..f0f6de8 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_0 ;
@@ -78,6 +75,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
index e29dde7..7126115 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_1 ;
@@ -78,6 +75,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
index 353b4e7..88b8421 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_2 ;
@@ -80,6 +77,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
index 8a2fb54..5ddc65a 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_4 ;
@@ -88,6 +85,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
index d294606..8c62fe7 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
index 722268a..e976a1f 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3_m ;
@@ -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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
index 6cc8a15..e0a97af 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3b_1 ;
@@ -77,6 +74,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
index 19c1357..31f502f 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3b_2 ;
@@ -79,6 +76,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.655000 4.990000 3.520000 ;
+        RECT  0.905000 1.645000 3.235000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
index ff14ae6..999964b 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3b_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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
index c1732f0..2eceb27 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3b_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
index 241f670..ea6d9d1 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor3b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor3b_m ;
@@ -76,6 +73,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
index e8f18f3..8a4ee4f 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
index cef37b1..c23a939 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
index 775c520..59d8aa7 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
index 4e18cee..9809aed 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_4 ;
@@ -97,6 +94,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
index 0dc7d55..de01eb3 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_lp ;
@@ -85,6 +82,23 @@
         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.655000 4.030000 3.520000 ;
+        RECT  1.045000 1.475000 2.225000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
index 1d5f7bd..c22d9ac 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4_m ;
@@ -86,6 +83,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
index 863221b..8000fe0 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4b_1 ;
@@ -86,6 +83,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
index 42a8d4f..aa601b9 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4b_2 ;
@@ -95,6 +92,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
index ade9a7c..222be5e 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4b_4 ;
@@ -100,6 +97,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.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
index ad01e42..a0cc3c7 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4b_lp ;
@@ -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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
index 6a03556..df855be 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4b_m ;
@@ -86,6 +83,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
index 399a556..44ae22f 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4bb_1 ;
@@ -86,6 +83,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
index 2e87726..239ef28 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4bb_2 ;
@@ -92,6 +89,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.655000 6.910000 3.520000 ;
+        RECT  2.135000 1.595000 4.505000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
index d5cd515..b34bf56 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4bb_4 ;
@@ -100,6 +97,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.655000 9.790000 3.520000 ;
+        RECT  1.555000 1.565000 5.605000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
index fdcb9be..2929424 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4bb_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4bb_lp ;
@@ -86,6 +83,23 @@
         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.655000 5.950000 3.520000 ;
+        RECT  2.135000 1.515000 3.315000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
index 553399c..2fa1c0f 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__nor4bb_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__nor4bb_m ;
@@ -87,6 +84,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
index 73120ac..ee0e4ca 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_0 ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
index befda4f..2feee08 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_1 ;
@@ -90,6 +87,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
index 7c4a78b..7be3374 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_2 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
index e520039..aa920a2 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_4 ;
@@ -103,6 +100,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
index fcbdc5b..c61fea4 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
index a7321e6..d20bf73 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111a_m ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
index 923f147..9d8fe9d 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
index 135f967..dd92283 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_1 ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
index 3bac146..44ccade 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
index 37fa367..1c3d1c4 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_4 ;
@@ -110,6 +107,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
index bab274b..519f587 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_lp ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
index 7c6e43c..7034a8a 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2111ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2111ai_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
index a7fb20d..0ab4617 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
index 5747071..4463cb7 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
index ccd9d5c..abd0b9a 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_2 ;
@@ -87,6 +84,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef
index 142bae8..b694dec 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
index 548862d..b1fb763 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
index 270c79a..ba41849 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211a_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
index 3257b9f..c8c7b9f 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
index e3da193..b24cdaa 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
index 3dedf04..6197a76 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
index fc9a77d..26fc063 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
index 7418bab..91cdaf8 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
index e0a7dc7..7026a97 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o211ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o211ai_m ;
@@ -88,6 +85,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
index 5f2f4f3..03bdcaf 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21a_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef
index 2669bea..8256886 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
index 8e595b6..e0a3034 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21a_2 ;
@@ -72,6 +69,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef
index 1a8c0be..c3a3de7 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21a_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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
index 211c366..25bb1f8 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21a_lp ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
index ab2a889..ca3b64a 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21a_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
index 1457f6c..5e83102 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ai_0 ;
@@ -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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
index f29702a..3cda243 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ai_1 ;
@@ -75,6 +72,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef
index 07ebfba..04c3e89 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
index 6921578..1d7ba26 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ai_4 ;
@@ -84,6 +81,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
index cc8fc29..9eaf4da 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ai_lp ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
index 4a1341f..f60a686 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ai_m ;
@@ -75,6 +72,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
index 3e82060..4a340b6 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef
index caaec3b..e24f4c2 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
index a92721c..de17107 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_2 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
index 5d18a62..5595120 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_4 ;
@@ -81,6 +78,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
index 564df0d..157135f 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
index fee080d..8db9955 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21ba_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21ba_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
index cad0983..ddf7081 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21bai_0 ;
@@ -75,6 +72,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
index 949d67e..d7c7bc7 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21bai_1 ;
@@ -75,6 +72,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef
index d7a8b0e..8366be7 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
index 9582d72..bd090a4 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21bai_4 ;
@@ -82,6 +79,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
index 9cdd6e3..e314d58 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21bai_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
index e2e75fc..a52095f 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o21bai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o21bai_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
index 2b62a48..a7ea4c4 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_0 ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
index adbc872..5f30919 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
index e7ee7f9..a0eb929 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
index 48bec2a..9e5d4c7 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_4 ;
@@ -102,6 +99,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.655000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
index 8b2e433..5429939 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
index c03d7a5..57209cb 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221a_m ;
@@ -92,6 +89,24 @@
         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.655000 0.750000 1.685000 ;
+        RECT -0.190000 1.685000 3.550000 3.520000 ;
+        RECT  2.205000 1.655000 3.550000 1.685000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
index e3a40cd..161142b 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_0 ;
@@ -97,6 +94,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
index 749e3bc..f979513 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_1 ;
@@ -97,6 +94,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
index b61723e..015c8ba 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_2 ;
@@ -101,6 +98,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
index 2f34b9e..93154ad 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_4 ;
@@ -110,6 +107,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
index 7f19a44..d29665b 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_lp ;
@@ -97,6 +94,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
index dcf7925..289406d 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o221ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o221ai_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
index 6f0a884..6c6f559 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_0 ;
@@ -90,6 +87,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef
index 0945462..e07c899 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef
index 2b0f2ef..5ef585d 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
index 42cae28..124315a 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_4 ;
@@ -93,6 +90,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
index 76db3d3..cb1a41c 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_lp ;
@@ -83,6 +80,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.655000 0.985000 1.915000 ;
+        RECT -0.190000 1.915000 4.030000 3.520000 ;
+        RECT  2.255000 1.655000 4.030000 1.915000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
index f1a2043..a030c9f 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22a_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
index a9aa4d8..ae330bf 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22ai_0 ;
@@ -85,6 +82,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef
index 664a4e9..0c3f721 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
index 1c3b3c2..218614e 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22ai_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
index 8efb2e3..ce072f1 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22ai_4 ;
@@ -102,6 +99,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
index 1ec9b86..0cede6c 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22ai_lp ;
@@ -86,6 +83,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
index a60e7e5..68e7597 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o22ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o22ai_m ;
@@ -86,6 +83,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
index b04ce94..c6481bf 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
index 8f6be1f..26fe8a4 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_1 ;
@@ -81,6 +78,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
index ea2750e..d5e5f1d 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
index 3e131dd..2b7e7fd 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_4 ;
@@ -93,6 +90,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.655000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
index 9295e1b..635054a 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_lp ;
@@ -81,6 +78,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
index fac239f..ff6b815 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2a_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
index 605b1e6..f75cfaf 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
index 7b1a7c6..ce2f36d 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
index 6202b00..259c6fe 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_2 ;
@@ -87,6 +84,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
index adc7f79..586b8ab 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_4 ;
@@ -94,6 +91,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef
index ec06373..b48a786 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
index f715112..6f127b7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o2bb2ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o2bb2ai_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
index a01a5ee..bb3343c 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef
index 51aae99..07b7301 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
index e6a1308..f6c583e 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_2 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
index 5d1e674..7e1aa0c 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_4 ;
@@ -97,6 +94,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.655000 8.350000 3.520000 ;
+        RECT  4.370000 1.545000 5.840000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
index 6e9a973..36c7b21 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
index bba822e..e3fd34a 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311a_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
index 1c513d4..bf2a6df 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef
index 051269d..2b68efd 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
index aed6607..015074f 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_2 ;
@@ -101,6 +98,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.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
index 2b4ef34..2ab6df6 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_4 ;
@@ -102,6 +99,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
index 6e0e61e..1fd3b8e 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_lp ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
index 9dee182..e85db1a 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o311ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o311ai_m ;
@@ -98,6 +95,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
index 5488b15..cc74e60 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31a_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
index ba5853e..773901d 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31a_1 ;
@@ -81,6 +78,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef
index a60cfe4..fd1da15 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
index 1d7aae1..87c652b 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31a_4 ;
@@ -90,6 +87,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.655000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
index e6b3951..6fbf422 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31a_lp ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
index 710de12..69f39ce 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31a_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
index 7726907..84035e2 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_0 ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef
index 0dbd26d..4a876dc 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
index 35d5349..0802f3e 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_2 ;
@@ -90,6 +87,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef
index 11b702b..4028c2f 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
index 739cedd..c9e5fa6 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_lp ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
index 62741f6..9852dc5 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o31ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o31ai_m ;
@@ -84,6 +81,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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
index c7c0831..029c17e 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32a_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef
index 0126847..cd915bf 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
index 2f0f231..7e2b70f 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32a_2 ;
@@ -90,6 +87,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
index 5295dd0..7deff32 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32a_4 ;
@@ -101,6 +98,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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
index 067500e..2b0f265 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32a_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
index a985043..9b330e3 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32a_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
index f057b46..6919907 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_0 ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
index c95b182..1eeb5b1 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
index bc1c9fa..1522e70 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_2 ;
@@ -96,6 +93,23 @@
         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.655000 6.430000 3.520000 ;
+        RECT  2.415000 1.645000 4.765000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
index 5e0a83f..51293fb 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_4 ;
@@ -102,6 +99,23 @@
         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.655000 10.750000 3.520000 ;
+        RECT  3.965000 1.565000  8.015000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
index 6295a99..4dfa3f4 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_lp ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
index c84a365..6e5ba2d 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o32ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o32ai_m ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
index 6c1c69d..12992d9 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_0 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
index f781e5f..a35e8c1 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_1 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
index c29b044..f5b2726 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_2 ;
@@ -90,6 +87,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
index ac77e97..1ba91b7 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_4 ;
@@ -96,6 +93,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.655000 7.870000 3.520000 ;
+        RECT  3.080000 1.545000 5.450000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
index 1f22cdb..f072dde 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_lp ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
index 82fdf0b..f983bba 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41a_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41a_m ;
@@ -91,6 +88,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
index c2204cd..325197c 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
index b0b5641..ab3b363 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_1 ;
@@ -96,6 +93,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
index dc83714..d3829d4 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_2 ;
@@ -94,6 +91,23 @@
         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.655000 6.430000 3.520000 ;
+        RECT  1.385000 1.645000 3.950000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
index a648007..0ad258f 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_4 ;
@@ -102,6 +99,23 @@
         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.655000 10.750000 3.520000 ;
+        RECT  2.590000 1.625000  6.640000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
index 564d2f0..f9c4062 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_lp ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
index 61fb63b..f1964f6 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__o41ai_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__o41ai_m ;
@@ -93,6 +90,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
index 640ef93..25acd51 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_0 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
index 5d5c855..03a13fb 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_1 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
index 7c84719..ce80768 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_2 ;
@@ -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.655000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
index b5e262c..bfd4320 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_4 ;
@@ -69,6 +66,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
index 3a32be0..9ec046b 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_lp ;
@@ -66,6 +63,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
index 4ca1dfd..44ccc8a 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_lp2 ;
@@ -63,6 +60,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
index 56a9c4b..e8d2e8f 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2_m ;
@@ -63,6 +60,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.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
index e994388..bc9880c 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2b_1 ;
@@ -65,6 +62,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
index 5337324..57a0db5 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2b_2 ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
index e4b6a84..db418cd 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2b_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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
index 30aa940..d14886e 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2b_lp ;
@@ -64,6 +61,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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
index ffdffcf..13f1e4d 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or2b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or2b_m ;
@@ -64,6 +61,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
index 4139af9..e354632 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3_0 ;
@@ -75,6 +72,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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef
index 4de1b58..1d16528 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef
index 1125831..e8fe18b 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
index 05484a6..fd4c543 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3_4 ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
index 394825c..9eb1cd0 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
index ff98b12..1710b98 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3_m ;
@@ -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.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
index cd340da..c31c87f 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3b_1 ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
index 60d6bca..13ecd38 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3b_2 ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
index 2dd3d8d..0d52a28 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3b_4 ;
@@ -76,6 +73,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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
index dc96918..abc78c4 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3b_lp ;
@@ -75,6 +72,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.655000 1.555000 1.685000 ;
+        RECT -0.190000 1.685000 4.990000 3.520000 ;
+        RECT  3.280000 1.655000 4.990000 1.685000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
index 557a225..9a6f594 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or3b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or3b_m ;
@@ -74,6 +71,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
index f63b614..aa73edc 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
index bd9b98a..f50560d 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
index 9e3de00..824e3e5 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
index 129c748..b87b486 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_4 ;
@@ -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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
index f9832f5..35fcd22 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_lp ;
@@ -83,6 +80,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.655000 0.635000 1.915000 ;
+        RECT -0.190000 1.915000 4.990000 3.520000 ;
+        RECT  2.915000 1.655000 4.990000 1.915000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
index 739eeab..e6f04d4 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
index aae8458..0e11c8d 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4b_1 ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
index 73a902d..749982a 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4b_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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
index 3c32807..604e9e9 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4b_4 ;
@@ -90,6 +87,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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
index d058abc..11bac80 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4b_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4b_lp ;
@@ -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.655000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
index 7a4716f..6cbaaa2 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4b_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4b_m ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
index 4356d2f..368342b 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4bb_1 ;
@@ -82,6 +79,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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef
index 46ec2de..630ddaf 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4bb_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.655000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
index 402b22d..66d3b76 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4bb_4 ;
@@ -85,6 +82,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
index 7444a65..56f6ce4 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4bb_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4bb_lp ;
@@ -83,6 +80,25 @@
         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.655000 1.740000 1.820000 ;
+        RECT -0.190000 1.820000 5.000000 1.915000 ;
+        RECT -0.190000 1.915000 7.390000 3.520000 ;
+        RECT  6.480000 1.655000 7.390000 1.915000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
index 4b18f79..7c2c876 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__or4bb_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__or4bb_m ;
@@ -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.655000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
index 44a166e..2b84b17 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfbbn_1 ;
@@ -116,6 +113,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.655000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
index e80f972..d51dc7e 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfbbn_2 ;
@@ -114,6 +111,23 @@
         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.655000 18.430000 3.520000 ;
+        RECT  2.560000 1.355000  3.590000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
index 84e2f06..83f92c5 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfbbp_1 ;
@@ -112,6 +109,15 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.245000 15.840000 0.245000 ;
+        RECT 0.000000  0.245000  0.500000 0.500000 ;
+    END
+  END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.840000 0.085000 ;
         RECT  0.175000  0.085000  0.505000 1.035000 ;
@@ -158,15 +164,6 @@
         RECT 15.035000 -0.085000 15.205000 0.085000 ;
         RECT 15.515000 -0.085000 15.685000 0.085000 ;
     END
-  END VGND
-  PIN VNB
-    DIRECTION INOUT ;
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.245000 15.840000 0.245000 ;
-        RECT 0.000000  0.245000  0.500000 0.500000 ;
-    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
index aec6df5..fdd7258 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrbp_1 ;
@@ -109,6 +106,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.655000 14.110000 3.520000 ;
+        RECT 11.120000 1.455000 12.205000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
index a9b07c8..56a13c8 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrbp_2 ;
@@ -108,6 +105,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.655000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
index d97acbf..4cb1980 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrbp_lp ;
@@ -109,6 +106,25 @@
         RECT 0.000000 -0.245000 19.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 19.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000  0.935000 2.275000 ;
+        RECT -0.190000 2.275000 19.390000 3.520000 ;
+        RECT  5.725000 1.655000 19.390000 2.275000 ;
+        RECT 14.760000 1.605000 16.990000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
index 0629c66..5137c08 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtn_1 ;
@@ -111,6 +108,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.655000 13.630000 3.520000 ;
+        RECT 11.670000 1.575000 12.805000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
index 4191342..fcf133f 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtp_1 ;
@@ -98,6 +95,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.655000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
index df8914d..1371e1b 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtp_2 ;
@@ -96,6 +93,22 @@
         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.655000 14.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
index cb8c9ca..4739982 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtp_4 ;
@@ -105,6 +102,22 @@
         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.655000 15.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
index 47bf5a5..00e7670 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtp_lp2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtp_lp2 ;
@@ -100,6 +97,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.655000 16.510000 3.520000 ;
+        RECT  6.705000 1.525000 11.790000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
index 7b238c8..366ff5f 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfrtp_ov2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfrtp_ov2 ;
@@ -98,6 +95,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.655000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
index 614a4bf..c9f7b49 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfsbp_1 ;
@@ -107,6 +104,22 @@
         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.655000 15.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
index e141e3f..b970e62 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfsbp_2 ;
@@ -110,6 +107,22 @@
         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.655000 15.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
index f409070..91adf2f 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfsbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfsbp_lp ;
@@ -112,6 +109,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.655000 16.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
index 308c189..5dab78f 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfstp_1 ;
@@ -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.655000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
index 2c85182..8ef52ae 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfstp_2 ;
@@ -97,6 +94,22 @@
         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.655000 15.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
index 9b9a472..52a3bb1 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfstp_4 ;
@@ -99,6 +96,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.655000 16.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
index 8b49972..19aec17 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfstp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfstp_lp ;
@@ -100,6 +97,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.655000 16.030000 3.520000 ;
+        RECT 12.725000 1.555000 14.075000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
index 9b253b3..a57bdb6 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxbp_1 ;
@@ -92,6 +89,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.655000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
index 9c10d72..c2e3d85 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxbp_2 ;
@@ -94,6 +91,22 @@
         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.655000 15.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
index e1063f9..51c6ab5 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxbp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxbp_lp ;
@@ -94,6 +91,24 @@
         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.655000 16.030000 3.520000 ;
+        RECT  3.630000 1.555000 10.055000 1.580000 ;
+        RECT  3.630000 1.580000 11.850000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
index 9ddfa3b..c0de66b 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxtp_1 ;
@@ -81,6 +78,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.655000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
index 8b005be..897bf69 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxtp_2 ;
@@ -81,6 +78,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.655000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
index db49d6d..56cb971 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxtp_4 ;
@@ -88,6 +85,23 @@
         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.655000 12.190000 3.520000 ;
+        RECT  8.735000 1.515000  9.795000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
index bcab6cb..ad4c122 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdfxtp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdfxtp_lp ;
@@ -83,6 +80,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.655000 14.110000 3.520000 ;
+        RECT  3.745000 1.555000 10.330000 1.625000 ;
+        RECT  3.745000 1.625000 12.060000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
index 239c86a..28eafbd 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdlclkp_1 ;
@@ -73,6 +70,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.655000 7.870000 3.520000 ;
+        RECT  3.995000 1.625000 5.035000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef
index 28e00da..0f1da74 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 8.350000 3.520000 ;
+        RECT  4.020000 1.645000 5.060000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
index 5c5afab..8a97dca 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdlclkp_4 ;
@@ -80,6 +77,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.655000 9.310000 3.520000 ;
+        RECT  4.120000 1.515000 5.180000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
index f9797a6..bf720a3 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sdlclkp_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sdlclkp_lp ;
@@ -74,6 +71,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.655000 5.395000 1.720000 ;
+        RECT -0.190000 1.720000 8.830000 3.520000 ;
+        RECT  1.940000 1.595000 5.395000 1.655000 ;
+        RECT  7.975000 1.655000 8.830000 1.720000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
index f1de327..b465b35 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_pargate_plv_14
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_pargate_plv_14 ;
@@ -44,6 +41,12 @@
         RECT 6.510000 1.965000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
index c86d4f6..f86872c 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_pargate_plv_21
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_pargate_plv_21 ;
@@ -44,6 +41,13 @@
         RECT 6.510000 1.550000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+        RECT  0.875000 1.285000 8.235000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
index 0cdb5a9..b7d637d 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_pargate_plv_28
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_pargate_plv_28 ;
@@ -44,6 +41,13 @@
         RECT 6.510000 1.105000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+        RECT  0.875000 0.815000 8.235000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
index 0ee0f5d..464f9a7 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_pargate_plv_7
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_pargate_plv_7 ;
@@ -44,6 +41,12 @@
         RECT 6.510000 2.825000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
index 78ee02c..c593235 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_sergate_plv_14
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_sergate_plv_14 ;
@@ -44,6 +41,12 @@
         RECT 6.510000 1.965000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
index 089be32..3f6a075 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_sergate_plv_21
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_sergate_plv_21 ;
@@ -44,6 +41,13 @@
         RECT 6.510000 1.550000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+        RECT  0.875000 1.285000 8.235000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
index 17c47d9..d3c5aa6 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sleep_sergate_plv_28
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_lp__sleep_sergate_plv_28 ;
@@ -44,6 +41,13 @@
         RECT 6.510000 1.105000 7.155000 3.085000 ;
     END
   END VIRTPWR
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 9.310000 3.520000 ;
+        RECT  0.875000 0.815000 8.235000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     USE POWER ;
     PORT
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
index 9f509ee..3cc3752 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srdlrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srdlrtp_1 ;
@@ -95,6 +92,23 @@
         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.655000 12.190000 3.520000 ;
+        RECT  5.055000 1.400000  7.200000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
index 2136753..050baf1 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srdlstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srdlstp_1 ;
@@ -92,6 +89,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.655000 13.150000 3.520000 ;
+        RECT  5.210000 1.395000  7.910000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
index a41016c..ae2eeda 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srdlxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srdlxtp_1 ;
@@ -82,6 +79,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.655000 9.310000 3.520000 ;
+        RECT  5.125000 1.495000 7.490000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
index 7936c98..41740a0 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sregrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sregrbp_1 ;
@@ -109,6 +106,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.655000 14.590000 3.520000 ;
+        RECT  3.625000 1.605000  5.135000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
index 40fd31c..e81130e 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__sregsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__sregsbp_1 ;
@@ -111,6 +108,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.655000 14.590000 3.520000 ;
+        RECT  3.625000 1.605000  5.135000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
index 078443b..734b823 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srsdfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srsdfrtn_1 ;
@@ -113,6 +110,27 @@
         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.655000  2.670000 1.915000 ;
+        RECT -0.190000 1.915000 18.430000 3.520000 ;
+        RECT  6.980000 1.430000 10.100000 1.655000 ;
+        RECT  6.980000 1.655000 18.430000 1.915000 ;
+        RECT 11.580000 1.555000 14.825000 1.655000 ;
+        RECT 13.515000 1.535000 14.825000 1.555000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
index a217e31..b098709 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srsdfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srsdfrtp_1 ;
@@ -109,6 +106,24 @@
         RECT 0.000000 -0.245000 20.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 20.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000  8.340000 1.985000 ;
+        RECT -0.190000 1.985000 20.830000 3.520000 ;
+        RECT  9.610000 1.655000 20.830000 1.985000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
index cdfdb40..473d5df 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srsdfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srsdfstp_1 ;
@@ -107,6 +104,23 @@
         RECT 0.000000 -0.245000 18.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 18.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 18.910000 3.520000 ;
+        RECT  2.245000 1.565000  4.025000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
index a2d860e..ca6b550 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__srsdfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__srsdfxtp_1 ;
@@ -106,6 +103,22 @@
         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.655000 14.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
index f097ce5..e08da7b 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_lp__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.655000 0.670000 3.520000 ;
   END
 END sky130_fd_sc_lp__tap_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
index d7125ab..48b38ab 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_lp__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.655000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_lp__tap_2
 END LIBRARY
diff --git a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
index e815173..87dc49c 100644
--- a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__tapvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_lp__tapvgnd_1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
index 8cdece8..14ef8fb 100644
--- a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__tapvgnd2_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_lp__tapvgnd2_1 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
index 49ec1ad..e27327a 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__tapvpwrvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_lp__tapvpwrvgnd_1 ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
index c1a64b8..6373d16 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
index b956a1b..5b66f09 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_1 ;
@@ -70,6 +67,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
index 29865f7..11ead1c 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_2 ;
@@ -79,6 +76,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
index 41da82e..73a0ab6 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_4 ;
@@ -84,6 +81,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
index 405120f..6b53403 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_lp ;
@@ -66,6 +63,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
index d650f8a..cc84928 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor2_m ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef
index b9e52b1..7cbf008 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__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.655000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
index 6507d1f..99f4f64 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xnor3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xnor3_lp ;
@@ -74,6 +71,24 @@
         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.655000 10.270000 3.520000 ;
+        RECT  3.635000 1.555000  7.955000 1.655000 ;
+        RECT  6.280000 1.485000  7.955000 1.555000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
index fb17040..2aa1582 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_0 ;
@@ -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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
index 9070e17..59a740e 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_1 ;
@@ -69,6 +66,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
index 7e3bdf7..66a8b5d 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_2 ;
@@ -84,6 +81,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.655000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
index 735f215..4aebfe1 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_4 ;
@@ -80,6 +77,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.655000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
index 64cd5b7..4100b76 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_lp ;
@@ -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.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
index 11cab86..3eec7b5 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor2_m
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor2_m ;
@@ -66,6 +63,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.655000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
index b44467e..b3e9edc 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor3_1 ;
@@ -73,6 +70,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.655000 9.790000 3.520000 ;
+        RECT  4.670000 1.605000 5.750000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef b/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
index 389e93d..8eb665c 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_lp__xor3_lp
   CLASS CORE ;
   FOREIGN sky130_fd_sc_lp__xor3_lp ;
@@ -77,6 +74,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.655000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;