diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.magic.lef
index dfcb237..8ccb0b2 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111o_1 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.magic.lef
index 10d4fd7..a4af020 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111o_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.magic.lef
index d316af2..d35ea21 100644
--- a/cells/a2111o/sky130_fd_sc_ms__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ms__a2111o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111o_4 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.magic.lef
index 2627be5..2df529c 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111oi_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.magic.lef
index 73e6a02..ab94832 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111oi_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.magic.lef
index fb1c88f..86fdfef 100644
--- a/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ms__a2111oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2111oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2111oi_4 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_ms__a211o_1.magic.lef
index 91ee7fe..b1bb4dd 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211o_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_ms__a211o_2.magic.lef
index e3f3ff9..88b775d 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211o_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211o/sky130_fd_sc_ms__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_ms__a211o_4.magic.lef
index 38b0367..e4c5034 100644
--- a/cells/a211o/sky130_fd_sc_ms__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ms__a211o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211o_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.magic.lef
index 4945e12..ba71d0a 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211oi_1 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.magic.lef
index 0e12245..96e8878 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211oi_2 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.magic.lef
index 5fccbaa..19385f9 100644
--- a/cells/a211oi/sky130_fd_sc_ms__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ms__a211oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a211oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a211oi_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.magic.lef
index 66e1c24..802f416 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21bo_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21bo_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.magic.lef
index 4b52894..5ec41fe 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21bo_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21bo_2 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.magic.lef
index 2348b36..a561bf6 100644
--- a/cells/a21bo/sky130_fd_sc_ms__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ms__a21bo_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21bo_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21bo_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.magic.lef
index d783243..65b712a 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21boi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21boi_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.magic.lef
index bd9d554..f18a24a 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21boi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21boi_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.magic.lef
index a701518..3435498 100644
--- a/cells/a21boi/sky130_fd_sc_ms__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ms__a21boi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21boi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21boi_4 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_ms__a21o_1.magic.lef
index e3099fa..cf3f83c 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21o_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_ms__a21o_2.magic.lef
index 305e830..4f7a3a8 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21o_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21o/sky130_fd_sc_ms__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_ms__a21o_4.magic.lef
index b2aba1e..98545f3 100644
--- a/cells/a21o/sky130_fd_sc_ms__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ms__a21o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21o_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.magic.lef
index d2d9bd0..920a731 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21oi_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.magic.lef
index 1b8d6de..814cf65 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21oi_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.magic.lef
index ffcaa8c..d46a27f 100644
--- a/cells/a21oi/sky130_fd_sc_ms__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ms__a21oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a21oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a21oi_4 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_ms__a221o_1.magic.lef
index f9af094..3b644af 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_ms__a221o_2.magic.lef
index 4622802..1d73b98 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221o_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221o/sky130_fd_sc_ms__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_ms__a221o_4.magic.lef
index 13669ed..343b0be 100644
--- a/cells/a221o/sky130_fd_sc_ms__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ms__a221o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221o_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.magic.lef
index 267dc5d..2d8bffe 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221oi_1 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.magic.lef
index ff22bbe..d7038ec 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221oi_2 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.magic.lef
index 27f4684..6f41d8c 100644
--- a/cells/a221oi/sky130_fd_sc_ms__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ms__a221oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a221oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a221oi_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_1.magic.lef b/cells/a222o/sky130_fd_sc_ms__a222o_1.magic.lef
index 2e1ef14..74bd472 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_1.magic.lef
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a222o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a222o_1 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222o/sky130_fd_sc_ms__a222o_2.magic.lef b/cells/a222o/sky130_fd_sc_ms__a222o_2.magic.lef
index ecc7ccc..aed757d 100644
--- a/cells/a222o/sky130_fd_sc_ms__a222o_2.magic.lef
+++ b/cells/a222o/sky130_fd_sc_ms__a222o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a222o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a222o_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.magic.lef
index a16fd52..383a619 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a222oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a222oi_1 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.magic.lef b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.magic.lef
index 5145bea..a50c9c5 100644
--- a/cells/a222oi/sky130_fd_sc_ms__a222oi_2.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_ms__a222oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a222oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a222oi_2 ;
@@ -126,6 +123,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_ms__a22o_1.magic.lef
index bd4ee4d..8371892 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22o_1 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_ms__a22o_2.magic.lef
index 88e1e53..0ef3321 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22o_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22o/sky130_fd_sc_ms__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_ms__a22o_4.magic.lef
index b9391a1..2aff3ea 100644
--- a/cells/a22o/sky130_fd_sc_ms__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ms__a22o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22o_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.magic.lef
index 17a3287..177a166 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22oi_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.magic.lef
index 486fbbf..2886d77 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22oi_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.magic.lef
index 23070aa..f6dbc31 100644
--- a/cells/a22oi/sky130_fd_sc_ms__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ms__a22oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a22oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a22oi_4 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.magic.lef
index 539dace..8d4e9f8 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2o_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.magic.lef
index 395171e..bb86503 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2o_2 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.magic.lef
index c6cbeab..f9e3856 100644
--- a/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ms__a2bb2o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2o_4 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.magic.lef
index 97a800a..f846da6 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2oi_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.magic.lef
index e539471..aced553 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2oi_2 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.magic.lef
index 4d93303..01eb303 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ms__a2bb2oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a2bb2oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a2bb2oi_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_ms__a311o_1.magic.lef
index 6649798..f9fb1f3 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311o_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_ms__a311o_2.magic.lef
index e2a7ecd..95b1310 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311o_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311o/sky130_fd_sc_ms__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_ms__a311o_4.magic.lef
index e862228..50ae506 100644
--- a/cells/a311o/sky130_fd_sc_ms__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ms__a311o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311o_4 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.magic.lef
index e5d5035..756f624 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311oi_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.magic.lef
index 8b4b44a..c0e01b9 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311oi_2 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.magic.lef
index 19bfcc6..9694115 100644
--- a/cells/a311oi/sky130_fd_sc_ms__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ms__a311oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a311oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a311oi_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_ms__a31o_1.magic.lef
index fb12d42..aed0851 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31o_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_ms__a31o_2.magic.lef
index 0d70fe3..cfa5b53 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31o_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31o/sky130_fd_sc_ms__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_ms__a31o_4.magic.lef
index 556a78b..81d92fc 100644
--- a/cells/a31o/sky130_fd_sc_ms__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ms__a31o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31o_4 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.magic.lef
index a68f991..3da0ac6 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31oi_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.magic.lef
index d89a081..d96d469 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31oi_2 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.magic.lef
index 6b5f1a9..7768ea9 100644
--- a/cells/a31oi/sky130_fd_sc_ms__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ms__a31oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a31oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a31oi_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_ms__a32o_1.magic.lef
index a8f9d40..3b9e3a5 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_ms__a32o_2.magic.lef
index a36778a..4a9c2c2 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32o_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32o/sky130_fd_sc_ms__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_ms__a32o_4.magic.lef
index 3bdd918..763a4e1 100644
--- a/cells/a32o/sky130_fd_sc_ms__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ms__a32o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32o_4 ;
@@ -105,6 +102,24 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.100000 1.780000 ;
+        RECT -0.190000 1.780000 8.350000 3.520000 ;
+        RECT  4.895000 1.660000 8.350000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.magic.lef
index cafd46f..a23cadf 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32oi_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.magic.lef
index 7192616..1312a6c 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32oi_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.magic.lef
index 3ebcd80..fd34d29 100644
--- a/cells/a32oi/sky130_fd_sc_ms__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ms__a32oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a32oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a32oi_4 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_ms__a41o_1.magic.lef
index 942a33f..de5f9bc 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41o_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_ms__a41o_2.magic.lef
index d46fd95..c7ccf11 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41o_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41o/sky130_fd_sc_ms__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_ms__a41o_4.magic.lef
index bd390dc..9890208 100644
--- a/cells/a41o/sky130_fd_sc_ms__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ms__a41o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41o_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.magic.lef
index 8268ba6..a41aab9 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41oi_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.magic.lef
index 1be792f..3d3bc32 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41oi_2 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.magic.lef
index 8f36e8a..7098e69 100644
--- a/cells/a41oi/sky130_fd_sc_ms__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ms__a41oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__a41oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__a41oi_4 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_ms__and2_1.magic.lef b/cells/and2/sky130_fd_sc_ms__and2_1.magic.lef
index 4099a65..b33fdfa 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_ms__and2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_ms__and2_2.magic.lef b/cells/and2/sky130_fd_sc_ms__and2_2.magic.lef
index 054cacc..4b8cbf0 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_ms__and2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2/sky130_fd_sc_ms__and2_4.magic.lef b/cells/and2/sky130_fd_sc_ms__and2_4.magic.lef
index a7565e0..741c1b6 100644
--- a/cells/and2/sky130_fd_sc_ms__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_ms__and2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_ms__and2b_1.magic.lef
index 8955f0f..31c045c 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2b_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_ms__and2b_2.magic.lef
index 4f7003f..35b43ba 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2b_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and2b/sky130_fd_sc_ms__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_ms__and2b_4.magic.lef
index 419a2f4..98219fe 100644
--- a/cells/and2b/sky130_fd_sc_ms__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ms__and2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and2b_4 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_ms__and3_1.magic.lef b/cells/and3/sky130_fd_sc_ms__and3_1.magic.lef
index 37d5564..5fea64e 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_ms__and3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_ms__and3_2.magic.lef b/cells/and3/sky130_fd_sc_ms__and3_2.magic.lef
index fb83fe4..252c963 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_ms__and3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3/sky130_fd_sc_ms__and3_4.magic.lef b/cells/and3/sky130_fd_sc_ms__and3_4.magic.lef
index d660fe0..34f51e2 100644
--- a/cells/and3/sky130_fd_sc_ms__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_ms__and3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_ms__and3b_1.magic.lef
index f6c319d..ca6871b 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3b_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_ms__and3b_2.magic.lef
index 7c72e8c..2c1f866 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3b_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and3b/sky130_fd_sc_ms__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_ms__and3b_4.magic.lef
index 17b930f..e3d551a 100644
--- a/cells/and3b/sky130_fd_sc_ms__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ms__and3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and3b_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_ms__and4_1.magic.lef b/cells/and4/sky130_fd_sc_ms__and4_1.magic.lef
index 49764b9..84fd868 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_ms__and4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_ms__and4_2.magic.lef b/cells/and4/sky130_fd_sc_ms__and4_2.magic.lef
index ff980b9..4075dc8 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_ms__and4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4_2 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4/sky130_fd_sc_ms__and4_4.magic.lef b/cells/and4/sky130_fd_sc_ms__and4_4.magic.lef
index 6436aa5..caaad75 100644
--- a/cells/and4/sky130_fd_sc_ms__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_ms__and4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_ms__and4b_1.magic.lef
index 10939c8..162304b 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4b_1 ;
@@ -83,6 +80,24 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.370000 1.940000 ;
+        RECT -0.190000 1.940000 4.510000 3.520000 ;
+        RECT  3.220000 1.660000 4.510000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_ms__and4b_2.magic.lef
index 045d934..2fe59f6 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4b_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4b/sky130_fd_sc_ms__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_ms__and4b_4.magic.lef
index 04697e9..6ce2686 100644
--- a/cells/and4b/sky130_fd_sc_ms__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ms__and4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4b_4 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.magic.lef
index 253010f..336146e 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4bb_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.magic.lef
index 5cfc20a..91001ee 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4bb_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.magic.lef
index b3b19ac..72ae703 100644
--- a/cells/and4bb/sky130_fd_sc_ms__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ms__and4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__and4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__and4bb_4 ;
@@ -86,6 +83,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.720000 1.760000 ;
+        RECT -0.190000 1.760000 9.310000 3.520000 ;
+        RECT  5.970000 1.660000 9.310000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_ms__buf_1.magic.lef b/cells/buf/sky130_fd_sc_ms__buf_1.magic.lef
index 40adef1..9685824 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_ms__buf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__buf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__buf_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_ms__buf_16.magic.lef b/cells/buf/sky130_fd_sc_ms__buf_16.magic.lef
index 755334d..4f5dc3f 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_ms__buf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__buf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__buf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_ms__buf_2.magic.lef b/cells/buf/sky130_fd_sc_ms__buf_2.magic.lef
index 9878db5..c1f9e1b 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_ms__buf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__buf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__buf_2 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_ms__buf_4.magic.lef b/cells/buf/sky130_fd_sc_ms__buf_4.magic.lef
index 06bb6af..4acee04 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_ms__buf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__buf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__buf_4 ;
@@ -62,6 +59,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/buf/sky130_fd_sc_ms__buf_8.magic.lef b/cells/buf/sky130_fd_sc_ms__buf_8.magic.lef
index 69cc99f..e830ed5 100644
--- a/cells/buf/sky130_fd_sc_ms__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_ms__buf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__buf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__buf_8 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.magic.lef
index 4ffa528..5c706b3 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__bufbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__bufbuf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.magic.lef
index 4027b2f..d0a1754 100644
--- a/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_ms__bufbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__bufbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__bufbuf_8 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.magic.lef
index fec082e..c4a0a8a 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__bufinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__bufinv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.magic.lef
index 71bb9be..efc2e34 100644
--- a/cells/bufinv/sky130_fd_sc_ms__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_ms__bufinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__bufinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__bufinv_8 ;
@@ -61,6 +58,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.magic.lef
index 45dd679..1727a56 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkbuf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkbuf_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.magic.lef
index 0dde8bf..a128655 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkbuf_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.magic.lef
index b5cba75..d0b9079 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkbuf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkbuf_2 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.magic.lef
index 85faa71..0055912 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkbuf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkbuf_4 ;
@@ -60,6 +57,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.magic.lef
index 781abba..653439f 100644
--- a/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ms__clkbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkbuf_8 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.magic.lef b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.magic.lef
index c56c76d..e05f7fe 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.magic.lef
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ms__clkdlyinv3sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv3sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv3sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.magic.lef b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.magic.lef
index ae45eac..e40ca76 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.magic.lef
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ms__clkdlyinv3sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv3sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv3sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.magic.lef b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.magic.lef
index 5045af0..ae3abb1 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.magic.lef
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ms__clkdlyinv3sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv3sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv3sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.magic.lef b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.magic.lef
index 9b4cf2f..a07bd83 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.magic.lef
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ms__clkdlyinv5sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv5sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv5sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.magic.lef b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.magic.lef
index 30e08ce..2fb3ef7 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.magic.lef
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ms__clkdlyinv5sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv5sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv5sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.magic.lef b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.magic.lef
index 1e12496..5f12afd 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.magic.lef
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ms__clkdlyinv5sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkdlyinv5sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkdlyinv5sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.magic.lef
index 818e4e8..31caf23 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkinv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkinv_1 ;
@@ -59,6 +56,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.magic.lef
index b4d048d..a423060 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkinv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.magic.lef
index 44a09b3..ea53a8e 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkinv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkinv_2 ;
@@ -59,6 +56,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.magic.lef
index d5c48c3..0693b3f 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkinv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkinv_4 ;
@@ -62,6 +59,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.magic.lef
index 9356c45..9a68ac5 100644
--- a/cells/clkinv/sky130_fd_sc_ms__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ms__clkinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__clkinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__clkinv_8 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/conb/sky130_fd_sc_ms__conb_1.magic.lef b/cells/conb/sky130_fd_sc_ms__conb_1.magic.lef
index be16b68..758f126 100644
--- a/cells/conb/sky130_fd_sc_ms__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_ms__conb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__conb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__conb_1 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_ms__decap_4.magic.lef b/cells/decap/sky130_fd_sc_ms__decap_4.magic.lef
index 741c25e..da0e751 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_ms__decap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__decap_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__decap_4 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_ms__decap_8.magic.lef b/cells/decap/sky130_fd_sc_ms__decap_8.magic.lef
index 9dd8eff..ac065a4 100644
--- a/cells/decap/sky130_fd_sc_ms__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_ms__decap_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__decap_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__decap_8 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.magic.lef
index ead4a93..4ff75ab 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfbbn_1 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.magic.lef
index a11b210..4ca442b 100644
--- a/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_ms__dfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfbbn_2 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.magic.lef
index 0d837bf..8e96134 100644
--- a/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_ms__dfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfbbp_1 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.magic.lef
index 8de5989..9d45522 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrbp_1 ;
@@ -91,6 +88,26 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.360000 1.755000 ;
+        RECT -0.190000 1.755000 11.710000 3.520000 ;
+        RECT  3.035000 1.620000  7.060000 1.660000 ;
+        RECT  3.035000 1.660000 11.710000 1.755000 ;
+        RECT  5.540000 1.555000  7.060000 1.620000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.magic.lef
index f9fa0b6..d0fcfeb 100644
--- a/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_ms__dfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrbp_2 ;
@@ -93,6 +90,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.035000 1.675000 ;
+        RECT -0.190000 1.675000  2.130000 2.245000 ;
+        RECT -0.190000 2.245000 14.110000 3.520000 ;
+        RECT  5.200000 1.660000 14.110000 2.245000 ;
+        RECT 10.235000 1.580000 12.385000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.magic.lef
index 5bfb7a3..f846a6e 100644
--- a/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_ms__dfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrtn_1 ;
@@ -81,6 +78,25 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.110000 1.675000 ;
+        RECT -0.190000 1.675000 11.230000 3.520000 ;
+        RECT  1.290000 1.555000  3.110000 1.660000 ;
+        RECT  6.920000 1.660000 11.230000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.magic.lef
index 849ccca..c9c1cdd 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrtp_1 ;
@@ -81,6 +78,25 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.150000 1.755000 ;
+        RECT -0.190000 1.755000 11.230000 3.520000 ;
+        RECT  5.320000 1.555000  6.400000 1.660000 ;
+        RECT  5.320000 1.660000 11.230000 1.755000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.magic.lef
index 82addc4..461ff36 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrtp_2 ;
@@ -79,6 +76,25 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.290000 1.675000 ;
+        RECT -0.190000 1.675000 11.710000 3.520000 ;
+        RECT  3.145000 1.555000  6.930000 1.660000 ;
+        RECT  3.145000 1.660000 11.710000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.magic.lef
index 9b96206..50c83e1 100644
--- a/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ms__dfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfrtp_4 ;
@@ -88,6 +85,24 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.375000 1.780000 ;
+        RECT -0.190000 1.780000 13.630000 3.520000 ;
+        RECT  3.020000 1.660000 13.630000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.magic.lef
index 6077315..daaa6ec 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfsbp_1 ;
@@ -89,6 +86,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.715000 1.660000 ;
+        RECT  5.675000 1.525000  6.715000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.magic.lef
index 2dc6d18..c209d0c 100644
--- a/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_ms__dfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfsbp_2 ;
@@ -88,6 +85,24 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  0.965000 1.610000  6.735000 1.660000 ;
+        RECT  5.695000 1.525000  6.735000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.magic.lef
index 16d397a..c1e40bc 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfstp_1 ;
@@ -77,6 +74,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.940000 1.570000  6.430000 1.660000 ;
+        RECT  5.390000 1.525000  6.430000 1.570000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.magic.lef
index 5a4bffb..43ac735 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfstp_2 ;
@@ -79,6 +76,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.775000 1.660000 ;
+        RECT  5.735000 1.525000  6.775000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.magic.lef
index 8ac5f7d..592fc19 100644
--- a/cells/dfstp/sky130_fd_sc_ms__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ms__dfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfstp_4 ;
@@ -83,6 +80,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  5.505000 1.555000  6.545000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.magic.lef
index 17f3e9b..8701d33 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfxbp_1 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.magic.lef
index 85dc5df..3eed37d 100644
--- a/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_ms__dfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfxbp_2 ;
@@ -77,6 +74,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.700000 1.940000 ;
+        RECT -0.190000 1.940000 11.230000 3.520000 ;
+        RECT  5.205000 1.660000 11.230000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.magic.lef
index 0525e96..f8be4d4 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfxtp_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.magic.lef
index 09a74c3..423d51c 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfxtp_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.magic.lef
index 158bec1..025458b 100644
--- a/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ms__dfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dfxtp_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/diode/sky130_fd_sc_ms__diode_2.magic.lef b/cells/diode/sky130_fd_sc_ms__diode_2.magic.lef
index 8a97de3..23c3116 100644
--- a/cells/diode/sky130_fd_sc_ms__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_ms__diode_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__diode_2
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_ms__diode_2 ;
@@ -28,11 +25,24 @@
   SIZE  0.960000 BY  3.330000 ;
   PIN DIODE
     ANTENNADIFFAREA  0.641700 ;
+    ANTENNAGATEAREA  0.641700 ;
     PORT
       LAYER li1 ;
         RECT 0.095000 0.265000 0.865000 3.065000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.magic.lef
index 02c031f..b72c55e 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlclkp_1 ;
@@ -64,6 +61,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.670000 1.785000 ;
+        RECT -0.190000 1.785000 6.910000 3.520000 ;
+        RECT  5.035000 1.660000 6.910000 1.785000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.magic.lef
index 7d3c3c3..8ce0e2c 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlclkp_2 ;
@@ -63,6 +60,25 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 7.870000 3.520000 ;
+        RECT  4.355000 1.755000 7.870000 1.780000 ;
+        RECT  6.205000 1.660000 7.870000 1.755000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.magic.lef
index 95f4ad5..0a22838 100644
--- a/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ms__dlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlclkp_4 ;
@@ -70,6 +67,25 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.215000 1.705000 ;
+        RECT -0.190000 1.705000 3.205000 1.930000 ;
+        RECT -0.190000 1.930000 8.830000 3.520000 ;
+        RECT  4.475000 1.660000 8.830000 1.930000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.magic.lef
index d55649a..a33bb66 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrbn_1 ;
@@ -85,6 +82,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.535000 1.560000 7.080000 1.660000 ;
+        RECT  5.025000 1.530000 7.080000 1.560000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.magic.lef
index 7fc957c..c83caeb 100644
--- a/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_ms__dlrbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrbn_2 ;
@@ -85,6 +82,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  1.455000 1.560000 2.295000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.magic.lef
index 9219d41..a8f532b 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrbp_1 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.magic.lef
index 3779082..334bf30 100644
--- a/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_ms__dlrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrbp_2 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.magic.lef
index a870963..8f7c330 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtn_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.magic.lef
index 5b05b99..ff582f8 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtn_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.magic.lef
index 7687e7b..39125a4 100644
--- a/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ms__dlrtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtn_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.magic.lef
index b9925f7..0d8c1e7 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtp_1 ;
@@ -74,6 +71,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 6.910000 3.520000 ;
+        RECT  2.905000 1.660000 6.910000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.magic.lef
index f1f85e7..1fe2a2a 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtp_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.magic.lef
index 1f21405..47c9faf 100644
--- a/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ms__dlrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlrtp_4 ;
@@ -78,6 +75,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.480000 1.780000 ;
+        RECT -0.190000 1.780000 9.310000 3.520000 ;
+        RECT  2.870000 1.660000 9.310000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.magic.lef
index 4ff8b39..cfaf22d 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxbn_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  4.625000 1.580000 5.695000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.magic.lef
index f55ed2b..667e770 100644
--- a/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_ms__dlxbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxbn_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.magic.lef
index 44fc31b..24230e3 100644
--- a/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_ms__dlxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxbp_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.magic.lef
index 819d6a6..86ba0c5 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxtn_1 ;
@@ -63,6 +60,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.magic.lef
index 78198e4..5776dd0 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxtn_2 ;
@@ -65,6 +62,23 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+        RECT  4.670000 1.635000 5.740000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.magic.lef
index 6a64291..6a04e15 100644
--- a/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ms__dlxtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxtn_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.magic.lef
index 57c5e2f..fe603dc 100644
--- a/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_ms__dlxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlxtp_1 ;
@@ -65,6 +62,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  4.110000 1.505000 5.865000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.magic.lef
index bf4a8cb..709fe02 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_ms__dlygate4sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlygate4sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlygate4sd1_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.magic.lef
index 59f9854..9c43384 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_ms__dlygate4sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlygate4sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlygate4sd2_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.magic.lef
index 0baee5f..0dbf976 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_ms__dlygate4sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlygate4sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlygate4sd3_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.magic.lef
index 121e4d1..d9c6b06 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ms__dlymetal6s2s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlymetal6s2s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlymetal6s2s_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.magic.lef
index 7a872e9..7788cfa 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ms__dlymetal6s4s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlymetal6s4s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlymetal6s4s_1 ;
@@ -56,6 +53,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.magic.lef
index ccae3c8..96ac732 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ms__dlymetal6s6s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__dlymetal6s6s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__dlymetal6s6s_1 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.magic.lef
index 9712a07..bc1797a 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ebufn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ebufn_1 ;
@@ -69,6 +66,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.magic.lef
index 85d928e..753df21 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ebufn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ebufn_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.magic.lef
index 13dc8c4..527a025 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ebufn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ebufn_4 ;
@@ -69,6 +66,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.magic.lef
index dba06be..7896d2a 100644
--- a/cells/ebufn/sky130_fd_sc_ms__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ms__ebufn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ebufn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ebufn_8 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.magic.lef
index bf05cee..abddd02 100644
--- a/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_ms__edfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__edfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__edfxbp_1 ;
@@ -85,6 +82,24 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  4.945000 1.650000  6.045000 1.660000 ;
+        RECT 11.870000 1.645000 12.940000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.magic.lef
index a9509d5..ca74d7a 100644
--- a/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_ms__edfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__edfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__edfxtp_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  3.525000 1.580000  4.590000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_ms__einvn_1.magic.lef
index d64e557..4ab8cb0 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvn_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_ms__einvn_2.magic.lef
index 81beb3c..f3e00e8 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvn_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_ms__einvn_4.magic.lef
index 37dabc9..d896a6e 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvn_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvn/sky130_fd_sc_ms__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_ms__einvn_8.magic.lef
index 0de0728..3392e00 100644
--- a/cells/einvn/sky130_fd_sc_ms__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ms__einvn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvn_8 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_ms__einvp_1.magic.lef
index f7691a4..985b006 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvp_1 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_ms__einvp_2.magic.lef
index 15af4c1..7785ad1 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvp_2 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_ms__einvp_4.magic.lef
index 877c29c..f906c7c 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvp_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/einvp/sky130_fd_sc_ms__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_ms__einvp_8.magic.lef
index 6b50b62..91d2f9b 100644
--- a/cells/einvp/sky130_fd_sc_ms__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ms__einvp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__einvp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__einvp_8 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_ms__fa_1.magic.lef b/cells/fa/sky130_fd_sc_ms__fa_1.magic.lef
index e5595c3..b722118 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_ms__fa_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fa_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fa_1 ;
@@ -98,6 +95,23 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.500000 1.555000 7.480000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_ms__fa_2.magic.lef b/cells/fa/sky130_fd_sc_ms__fa_2.magic.lef
index d7dfd9b..2e5cbc8 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_ms__fa_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fa_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fa_2 ;
@@ -105,6 +102,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  0.635000 1.555000 5.915000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fa/sky130_fd_sc_ms__fa_4.magic.lef b/cells/fa/sky130_fd_sc_ms__fa_4.magic.lef
index 65be9d6..3d9aa21 100644
--- a/cells/fa/sky130_fd_sc_ms__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_ms__fa_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fa_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fa_4 ;
@@ -109,6 +106,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.635000 1.555000  6.620000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_ms__fah_1.magic.lef b/cells/fah/sky130_fd_sc_ms__fah_1.magic.lef
index ec5e4b3..62298bb 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_ms__fah_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fah_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fah_1 ;
@@ -87,6 +84,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.165000 1.940000 ;
+        RECT -0.190000 1.940000 14.110000 3.520000 ;
+        RECT  5.525000 1.605000 12.450000 1.660000 ;
+        RECT  5.525000 1.660000 14.110000 1.940000 ;
+        RECT  9.485000 1.530000 12.450000 1.605000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_ms__fah_2.magic.lef b/cells/fah/sky130_fd_sc_ms__fah_2.magic.lef
index 1c808ab..395ed19 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_2.magic.lef
+++ b/cells/fah/sky130_fd_sc_ms__fah_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fah_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fah_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fah/sky130_fd_sc_ms__fah_4.magic.lef b/cells/fah/sky130_fd_sc_ms__fah_4.magic.lef
index 5ddc006..31c7e73 100644
--- a/cells/fah/sky130_fd_sc_ms__fah_4.magic.lef
+++ b/cells/fah/sky130_fd_sc_ms__fah_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fah_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fah_4 ;
@@ -91,6 +88,25 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  7.055000 1.715000 ;
+        RECT -0.190000 1.715000 15.550000 3.520000 ;
+        RECT  1.415000 1.630000  7.055000 1.660000 ;
+        RECT  8.400000 1.660000 15.550000 1.715000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.magic.lef
index 166ea06..247168e 100644
--- a/cells/fahcin/sky130_fd_sc_ms__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_ms__fahcin_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fahcin_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fahcin_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.magic.lef
index 78ea8c1..9ab6128 100644
--- a/cells/fahcon/sky130_fd_sc_ms__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_ms__fahcon_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fahcon_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__fahcon_1 ;
@@ -87,6 +84,23 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+        RECT  1.250000 1.645000  5.035000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_ms__fill_1.magic.lef b/cells/fill/sky130_fd_sc_ms__fill_1.magic.lef
index 62b365b..3d44eab 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_ms__fill_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_1
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_ms__fill_1 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_ms__fill_2.magic.lef b/cells/fill/sky130_fd_sc_ms__fill_2.magic.lef
index a787190..e92f535 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_ms__fill_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_2
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_ms__fill_2 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_ms__fill_4.magic.lef b/cells/fill/sky130_fd_sc_ms__fill_4.magic.lef
index 78b813a..4d47705 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_ms__fill_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_ms__fill_4 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_ms__fill_8.magic.lef b/cells/fill/sky130_fd_sc_ms__fill_8.magic.lef
index d4bc657..9d58f56 100644
--- a/cells/fill/sky130_fd_sc_ms__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_ms__fill_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_ms__fill_8 ;
@@ -36,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.magic.lef b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.magic.lef
index 85fc00e..806db9e 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_2.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_diode_2
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_ms__fill_diode_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.magic.lef b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.magic.lef
index 427c960..831a1b1 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_4.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_diode_4
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_ms__fill_diode_4 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.magic.lef b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.magic.lef
index 033f069..6c35549 100644
--- a/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ms__fill_diode_8.magic.lef
@@ -18,14 +18,23 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__fill_diode_8
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_ms__fill_diode_8 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/ha/sky130_fd_sc_ms__ha_1.magic.lef b/cells/ha/sky130_fd_sc_ms__ha_1.magic.lef
index bef0215..25b621c 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_ms__ha_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ha_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ha_1 ;
@@ -78,6 +75,24 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.745000 1.780000 ;
+        RECT -0.190000 1.780000 4.990000 3.520000 ;
+        RECT  3.110000 1.660000 4.990000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_ms__ha_2.magic.lef b/cells/ha/sky130_fd_sc_ms__ha_2.magic.lef
index 3b60eb7..c04389a 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_ms__ha_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ha_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ha_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/ha/sky130_fd_sc_ms__ha_4.magic.lef b/cells/ha/sky130_fd_sc_ms__ha_4.magic.lef
index bdf6ff9..dc90fff 100644
--- a/cells/ha/sky130_fd_sc_ms__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_ms__ha_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__ha_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__ha_4 ;
@@ -79,6 +76,23 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+        RECT  3.545000 1.585000  4.805000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_ms__inv_1.magic.lef b/cells/inv/sky130_fd_sc_ms__inv_1.magic.lef
index 6b546be..06b9732 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_ms__inv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__inv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__inv_1 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_ms__inv_16.magic.lef b/cells/inv/sky130_fd_sc_ms__inv_16.magic.lef
index 5d0806b..119bc7d 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_ms__inv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__inv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__inv_16 ;
@@ -54,6 +51,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_ms__inv_2.magic.lef b/cells/inv/sky130_fd_sc_ms__inv_2.magic.lef
index 18fc21b..dc868f4 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_ms__inv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__inv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__inv_2 ;
@@ -55,6 +52,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_ms__inv_4.magic.lef b/cells/inv/sky130_fd_sc_ms__inv_4.magic.lef
index 243f9be..88483a4 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_ms__inv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__inv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__inv_4 ;
@@ -60,6 +57,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_ms__inv_8.magic.lef b/cells/inv/sky130_fd_sc_ms__inv_8.magic.lef
index 475b25d..3f34572 100644
--- a/cells/inv/sky130_fd_sc_ms__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_ms__inv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__inv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__inv_8 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_ms__maj3_1.magic.lef
index 7bfa85e..146f1e7 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__maj3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__maj3_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_ms__maj3_2.magic.lef
index e359171..f3edfa7 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__maj3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__maj3_2 ;
@@ -76,6 +73,23 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+        RECT  1.875000 1.555000 3.825000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/maj3/sky130_fd_sc_ms__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_ms__maj3_4.magic.lef
index bbc0bd3..8688fd9 100644
--- a/cells/maj3/sky130_fd_sc_ms__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ms__maj3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__maj3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__maj3_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_ms__mux2_1.magic.lef
index c7d9380..fcce4a5 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_ms__mux2_2.magic.lef
index e3c2df1..cffd25f 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2/sky130_fd_sc_ms__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_ms__mux2_4.magic.lef
index 783f0dc..e417330 100644
--- a/cells/mux2/sky130_fd_sc_ms__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ms__mux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2_4 ;
@@ -82,6 +79,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  0.850000 1.470000 1.690000 1.575000 ;
+        RECT  0.850000 1.575000 2.930000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.magic.lef
index 9c25382..0580e8e 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2i_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2i_1 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.magic.lef
index 822be96..a9c72c5 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2i_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2i_2 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.magic.lef
index b978104..1141ff8 100644
--- a/cells/mux2i/sky130_fd_sc_ms__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ms__mux2i_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux2i_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux2i_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_ms__mux4_1.magic.lef
index d3e2347..65f691d 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux4_1 ;
@@ -101,6 +98,23 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  0.680000 1.525000 4.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_ms__mux4_2.magic.lef
index 89a00a6..ff3d2f7 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux4_2 ;
@@ -111,6 +108,24 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  6.910000 1.760000 ;
+        RECT -0.190000 1.760000 10.750000 3.520000 ;
+        RECT  8.275000 1.660000 10.750000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/mux4/sky130_fd_sc_ms__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_ms__mux4_4.magic.lef
index a2dc81d..bc7482c 100644
--- a/cells/mux4/sky130_fd_sc_ms__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ms__mux4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__mux4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__mux4_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_ms__nand2_1.magic.lef
index 418a859..1c1145f 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_ms__nand2_2.magic.lef
index e3d16f0..8d24600 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_ms__nand2_4.magic.lef
index bd40533..6ec7a3b 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2_4 ;
@@ -70,6 +67,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2/sky130_fd_sc_ms__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_ms__nand2_8.magic.lef
index 9b37369..0e3727a 100644
--- a/cells/nand2/sky130_fd_sc_ms__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ms__nand2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2_8 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.magic.lef
index 304f187..f077276 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2b_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.magic.lef
index dc92fd2..7421878 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2b_2 ;
@@ -67,6 +64,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.magic.lef
index da13aaf..d44bcdd 100644
--- a/cells/nand2b/sky130_fd_sc_ms__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ms__nand2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand2b_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_ms__nand3_1.magic.lef
index 5ee58be..f2c93d3 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_ms__nand3_2.magic.lef
index 3dbdb3a..2847f09 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3/sky130_fd_sc_ms__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_ms__nand3_4.magic.lef
index d47037d..83e75ce 100644
--- a/cells/nand3/sky130_fd_sc_ms__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ms__nand3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3_4 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.magic.lef
index 9e7c312..af7e4f1 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3b_1 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.magic.lef
index eab94cd..e6a9474 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3b_2 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.magic.lef
index 2808f68..35a7656 100644
--- a/cells/nand3b/sky130_fd_sc_ms__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ms__nand3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand3b_4 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_ms__nand4_1.magic.lef
index e35a034..c22b8ab 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_ms__nand4_2.magic.lef
index 2412cab..b02890d 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4_2 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4/sky130_fd_sc_ms__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_ms__nand4_4.magic.lef
index d57c168..01acd37 100644
--- a/cells/nand4/sky130_fd_sc_ms__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ms__nand4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.magic.lef
index 9426dad..a4f4d97 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4b_1 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.magic.lef
index 97eeb0d..0eef1c4 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4b_2 ;
@@ -90,6 +87,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.magic.lef
index 05406a0..1b331f6 100644
--- a/cells/nand4b/sky130_fd_sc_ms__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ms__nand4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4b_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.magic.lef
index 3fc94ff..f0b2e51 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4bb_1 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.magic.lef
index d173961..47e904c 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4bb_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.magic.lef
index e4eab39..3c5c7bc 100644
--- a/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ms__nand4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nand4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nand4bb_4 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_ms__nor2_1.magic.lef
index 563f43b..28543aa 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_ms__nor2_2.magic.lef
index 536596d..70d340d 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2_2 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_ms__nor2_4.magic.lef
index 81e4755..3b1ff38 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2_4 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_ms__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_ms__nor2_8.magic.lef
index b94b4a7..4a14140 100644
--- a/cells/nor2/sky130_fd_sc_ms__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ms__nor2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2_8 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.magic.lef
index f0dfde1..55f42d3 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2b_1 ;
@@ -66,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.magic.lef
index c7df8c8..1220046 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2b_2 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.magic.lef
index 265c7f0..a1ec803 100644
--- a/cells/nor2b/sky130_fd_sc_ms__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ms__nor2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor2b_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_ms__nor3_1.magic.lef
index 5d1f96e..be79238 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3_1 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_ms__nor3_2.magic.lef
index a96eab3..ec1f2a9 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3_2 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3/sky130_fd_sc_ms__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_ms__nor3_4.magic.lef
index 762e330..12aca83 100644
--- a/cells/nor3/sky130_fd_sc_ms__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ms__nor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3_4 ;
@@ -88,6 +85,23 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+        RECT  1.780000 1.590000 3.830000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.magic.lef
index 8caa327..1722091 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3b_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.magic.lef
index e0de337..6610f9f 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3b_2 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.magic.lef
index 77be6a2..3c5501c 100644
--- a/cells/nor3b/sky130_fd_sc_ms__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ms__nor3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor3b_4 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_ms__nor4_1.magic.lef
index 1132770..2efdfac 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_ms__nor4_2.magic.lef
index 809c2d6..3f6718d 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4/sky130_fd_sc_ms__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_ms__nor4_4.magic.lef
index 6450ec5..79dbadc 100644
--- a/cells/nor4/sky130_fd_sc_ms__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ms__nor4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.magic.lef
index e0ba4b7..03d95a3 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4b_1 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.magic.lef
index 5aa506f..950a241 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4b_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.magic.lef
index ffe202d..159b2a9 100644
--- a/cells/nor4b/sky130_fd_sc_ms__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ms__nor4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4b_4 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.magic.lef
index aa4534e..35c8dc9 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4bb_1 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.magic.lef
index a5dc33b..7444b85 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4bb_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.magic.lef
index e0ff9ee..035edcc 100644
--- a/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ms__nor4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__nor4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__nor4bb_4 ;
@@ -102,6 +99,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  2.480000 1.565000  8.675000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.magic.lef
index eb87a06..1e113eb 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.magic.lef
index 9203b4f..3164be5 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111a_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.magic.lef
index 4771ab8..469b854 100644
--- a/cells/o2111a/sky130_fd_sc_ms__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ms__o2111a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111a_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.magic.lef
index dc5a234..0a79e17 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111ai_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.magic.lef
index 6895c8b..35d25fe 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111ai_2 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.magic.lef
index 3715296..ad80a7a 100644
--- a/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ms__o2111ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2111ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2111ai_4 ;
@@ -104,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_ms__o211a_1.magic.lef
index 5fb462b..456375d 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211a_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_ms__o211a_2.magic.lef
index 7f040e8..aff6569 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211a_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211a/sky130_fd_sc_ms__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_ms__o211a_4.magic.lef
index 7bb2587..bd614fd 100644
--- a/cells/o211a/sky130_fd_sc_ms__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ms__o211a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.magic.lef
index e579ec8..83dd88e 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211ai_1 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.magic.lef
index 0f23aec..34198f9 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211ai_2 ;
@@ -88,6 +85,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.magic.lef
index 57d33df..d5c6b16 100644
--- a/cells/o211ai/sky130_fd_sc_ms__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ms__o211ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o211ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o211ai_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_ms__o21a_1.magic.lef
index 29a37cd..1fe9c64 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21a_1 ;
@@ -73,6 +70,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_ms__o21a_2.magic.lef
index c94d185..e3afffc 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21a_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21a/sky130_fd_sc_ms__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_ms__o21a_4.magic.lef
index 594f3ab..6c4997d 100644
--- a/cells/o21a/sky130_fd_sc_ms__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ms__o21a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21a_4 ;
@@ -80,6 +77,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.magic.lef
index 5bcfdbe..8e01c25 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ai_1 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.magic.lef
index ce4270c..b16ef0b 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ai_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.magic.lef
index 3371c54..69eb782 100644
--- a/cells/o21ai/sky130_fd_sc_ms__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ms__o21ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ai_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.magic.lef
index 1520e21..82e6bae 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ba_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ba_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.magic.lef
index d89b87e..7843158 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ba_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ba_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.magic.lef
index d5b35e5..210dd5e 100644
--- a/cells/o21ba/sky130_fd_sc_ms__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ms__o21ba_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21ba_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21ba_4 ;
@@ -77,6 +74,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.magic.lef
index fff096a..098ac1d 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21bai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21bai_1 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.magic.lef
index 49b4309..acb1b92 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21bai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21bai_2 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.magic.lef
index b927f05..1f248bb 100644
--- a/cells/o21bai/sky130_fd_sc_ms__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ms__o21bai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o21bai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o21bai_4 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_ms__o221a_1.magic.lef
index 7808ce5..3fd20e4 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_ms__o221a_2.magic.lef
index a01c4d7..0f389f7 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221a_2 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221a/sky130_fd_sc_ms__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_ms__o221a_4.magic.lef
index 5032670..4591526 100644
--- a/cells/o221a/sky130_fd_sc_ms__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ms__o221a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221a_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.magic.lef
index fadd078..501cc56 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221ai_1 ;
@@ -96,6 +93,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.magic.lef
index b64fc45..162d953 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221ai_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.magic.lef
index d28bff1..96539a0 100644
--- a/cells/o221ai/sky130_fd_sc_ms__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ms__o221ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o221ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o221ai_4 ;
@@ -109,6 +106,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_ms__o22a_1.magic.lef
index 6937d4f..da0db2c 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22a_1 ;
@@ -84,6 +81,24 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.675000 ;
+        RECT -0.190000 1.675000 4.030000 3.520000 ;
+        RECT  3.190000 1.660000 4.030000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_ms__o22a_2.magic.lef
index 317a6ee..10fdf94 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22a_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22a/sky130_fd_sc_ms__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_ms__o22a_4.magic.lef
index 2e405ec..dc9cb5b 100644
--- a/cells/o22a/sky130_fd_sc_ms__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ms__o22a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22a_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.magic.lef
index 32ebcd6..bd343e0 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22ai_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.magic.lef
index 63c4f8f..192f399 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22ai_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.magic.lef
index 4866e79..15310f4 100644
--- a/cells/o22ai/sky130_fd_sc_ms__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ms__o22ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o22ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o22ai_4 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.magic.lef
index 8068932..519195e 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2a_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.magic.lef
index 4348ead..b7afbfc 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2a_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.magic.lef
index 2dacf77..183885b 100644
--- a/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ms__o2bb2a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.magic.lef
index b3646e4..b9277a9 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2ai_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.magic.lef
index e32ee1d..9fdbc03 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2ai_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.magic.lef
index dcc8d8b..77106ff 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ms__o2bb2ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o2bb2ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o2bb2ai_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_ms__o311a_1.magic.lef
index afa7bcc..34ff9a2 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311a_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_ms__o311a_2.magic.lef
index e33347a..640b940 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311a_2 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311a/sky130_fd_sc_ms__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_ms__o311a_4.magic.lef
index aba108f..cb46f3f 100644
--- a/cells/o311a/sky130_fd_sc_ms__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ms__o311a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311a_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.magic.lef
index 1765092..5c85f0f 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311ai_1 ;
@@ -94,6 +91,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.magic.lef
index 9988a53..bd73e75 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311ai_2 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.magic.lef
index 351270a..8c153e8 100644
--- a/cells/o311ai/sky130_fd_sc_ms__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ms__o311ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o311ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o311ai_4 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_ms__o31a_1.magic.lef
index 58f382d..37ed667 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31a_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_ms__o31a_2.magic.lef
index b219e78..df972ec 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31a_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31a/sky130_fd_sc_ms__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_ms__o31a_4.magic.lef
index d10b5f0..f6ee453 100644
--- a/cells/o31a/sky130_fd_sc_ms__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ms__o31a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31a_4 ;
@@ -87,6 +84,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.magic.lef
index a9de6d7..b604ba0 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31ai_1 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.magic.lef
index 0d5771e..e25349c 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31ai_2 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.magic.lef
index 182bbe2..e6f6df4 100644
--- a/cells/o31ai/sky130_fd_sc_ms__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ms__o31ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o31ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o31ai_4 ;
@@ -91,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_ms__o32a_1.magic.lef
index 4ecf9b1..cbbcdc8 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_ms__o32a_2.magic.lef
index 2ae860a..045a3e1 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32a_2 ;
@@ -93,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32a/sky130_fd_sc_ms__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_ms__o32a_4.magic.lef
index 301630c..8f88e7f 100644
--- a/cells/o32a/sky130_fd_sc_ms__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ms__o32a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32a_4 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.magic.lef
index 6d41d05..bfa2ef4 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32ai_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.magic.lef
index 7b06ed5..f498c66 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32ai_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.magic.lef
index 790dad5..affdc66 100644
--- a/cells/o32ai/sky130_fd_sc_ms__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ms__o32ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o32ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o32ai_4 ;
@@ -100,6 +97,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_ms__o41a_1.magic.lef
index b31855d..adef30c 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41a_1 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_ms__o41a_2.magic.lef
index 9a1ae1a..8a0068d 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41a_2 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41a/sky130_fd_sc_ms__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_ms__o41a_4.magic.lef
index c520b5e..1b42f0f 100644
--- a/cells/o41a/sky130_fd_sc_ms__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ms__o41a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41a_4 ;
@@ -99,6 +96,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.magic.lef
index 1628288..878ac75 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41ai_1 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.magic.lef
index d04918c..545ab65 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41ai_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.magic.lef
index ff20616..085a593 100644
--- a/cells/o41ai/sky130_fd_sc_ms__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ms__o41ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__o41ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__o41ai_4 ;
@@ -98,6 +95,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_ms__or2_1.magic.lef b/cells/or2/sky130_fd_sc_ms__or2_1.magic.lef
index 1f8e3bf..4cda35b 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_ms__or2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_ms__or2_2.magic.lef b/cells/or2/sky130_fd_sc_ms__or2_2.magic.lef
index a50735e..bf3ab8c 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_ms__or2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2_2 ;
@@ -64,6 +61,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2/sky130_fd_sc_ms__or2_4.magic.lef b/cells/or2/sky130_fd_sc_ms__or2_4.magic.lef
index 9c4f564..016c2dd 100644
--- a/cells/or2/sky130_fd_sc_ms__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_ms__or2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_ms__or2b_1.magic.lef
index 0344580..e2d2b6e 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2b_1 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_ms__or2b_2.magic.lef
index 67c1021..5d799d7 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2b_2 ;
@@ -65,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or2b/sky130_fd_sc_ms__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_ms__or2b_4.magic.lef
index d8e7abd..1b4a8bf 100644
--- a/cells/or2b/sky130_fd_sc_ms__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ms__or2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or2b_4 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_ms__or3_1.magic.lef b/cells/or3/sky130_fd_sc_ms__or3_1.magic.lef
index a7fd7af..d8f3389 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_ms__or3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_ms__or3_2.magic.lef b/cells/or3/sky130_fd_sc_ms__or3_2.magic.lef
index cdd3145..e79fca0 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_ms__or3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3_2 ;
@@ -76,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3/sky130_fd_sc_ms__or3_4.magic.lef b/cells/or3/sky130_fd_sc_ms__or3_4.magic.lef
index 4eb6223..efc98d4 100644
--- a/cells/or3/sky130_fd_sc_ms__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_ms__or3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3_4 ;
@@ -81,6 +78,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_ms__or3b_1.magic.lef
index 059e68b..41ca2b2 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3b_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_ms__or3b_2.magic.lef
index 954768c..4ae89a7 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3b_2 ;
@@ -75,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or3b/sky130_fd_sc_ms__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_ms__or3b_4.magic.lef
index f456ec3..2a1b992 100644
--- a/cells/or3b/sky130_fd_sc_ms__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ms__or3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or3b_4 ;
@@ -82,6 +79,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_ms__or4_1.magic.lef b/cells/or4/sky130_fd_sc_ms__or4_1.magic.lef
index 0ef9a95..6b25a2c 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_ms__or4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_ms__or4_2.magic.lef b/cells/or4/sky130_fd_sc_ms__or4_2.magic.lef
index e15d02e..e3c05ac 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_ms__or4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4_2 ;
@@ -85,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4/sky130_fd_sc_ms__or4_4.magic.lef b/cells/or4/sky130_fd_sc_ms__or4_4.magic.lef
index 95acfe3..ffba999 100644
--- a/cells/or4/sky130_fd_sc_ms__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_ms__or4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4_4 ;
@@ -92,6 +89,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_ms__or4b_1.magic.lef
index 982d5f9..6a795ad 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4b_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_ms__or4b_2.magic.lef
index f0faf9d..8e31be9 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4b_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4b/sky130_fd_sc_ms__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_ms__or4b_4.magic.lef
index f29ea10..b06924e 100644
--- a/cells/or4b/sky130_fd_sc_ms__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ms__or4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4b_4 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.magic.lef
index ab0623b..23a9820 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4bb_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.magic.lef
index b213be5..136edce 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4bb_2 ;
@@ -84,6 +81,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.magic.lef
index f2039b2..550bd54 100644
--- a/cells/or4bb/sky130_fd_sc_ms__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ms__or4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__or4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__or4bb_4 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.magic.lef
index 1a29486..984e345 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfbbn_1 ;
@@ -116,6 +113,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT 13.420000 1.550000 15.300000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.magic.lef
index 4f8863b..8a955d3 100644
--- a/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_ms__sdfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfbbn_2 ;
@@ -117,6 +114,22 @@
         RECT 0.000000 -0.245000 18.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 18.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 18.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.magic.lef
index 0d81326..cd9bd3f 100644
--- a/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_ms__sdfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfbbp_1 ;
@@ -123,6 +120,23 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+        RECT 12.680000 1.560000 14.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.magic.lef
index df33979..3c925be 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrbp_1 ;
@@ -110,6 +107,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.000000 1.675000 ;
+        RECT -0.190000 1.675000 14.110000 3.520000 ;
+        RECT  5.645000 1.640000  9.515000 1.660000 ;
+        RECT  5.645000 1.660000 14.110000 1.675000 ;
+        RECT  8.005000 1.555000  9.515000 1.640000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.magic.lef
index 9c8d8ec..166cd8f 100644
--- a/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_ms__sdfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrbp_2 ;
@@ -109,6 +106,26 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.860000 1.675000 ;
+        RECT -0.190000 1.675000 15.070000 3.520000 ;
+        RECT  5.885000 1.660000 15.070000 1.675000 ;
+        RECT  7.970000 1.555000  9.470000 1.595000 ;
+        RECT  7.970000 1.595000 12.540000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.magic.lef
index 537ef24..737ab3c 100644
--- a/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_ms__sdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrtn_1 ;
@@ -98,6 +95,25 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  5.830000 1.780000 ;
+        RECT -0.190000 1.780000 14.110000 3.520000 ;
+        RECT  4.115000 1.555000  5.830000 1.660000 ;
+        RECT  9.725000 1.660000 14.110000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.magic.lef
index dfcd7ed..a300c51 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrtp_1 ;
@@ -101,6 +98,25 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  2.635000 1.755000 ;
+        RECT -0.190000 1.755000 13.630000 3.520000 ;
+        RECT  7.135000 1.660000 13.630000 1.755000 ;
+        RECT  8.145000 1.555000  9.665000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.magic.lef
index fd03ea1..e571d82 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrtp_2 ;
@@ -101,6 +98,25 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.660000 1.675000 ;
+        RECT -0.190000 1.675000 14.590000 3.520000 ;
+        RECT  6.050000 1.660000 14.590000 1.675000 ;
+        RECT  8.120000 1.555000  9.780000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.magic.lef
index a395ccf..1d25aee 100644
--- a/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ms__sdfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfrtp_4 ;
@@ -107,6 +104,25 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.550000 1.675000 ;
+        RECT -0.190000 1.675000 15.070000 3.520000 ;
+        RECT  5.970000 1.660000 15.070000 1.675000 ;
+        RECT  8.125000 1.555000  9.645000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.magic.lef
index f5559a5..f746724 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfsbp_1 ;
@@ -107,6 +104,23 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  7.405000 1.555000  8.470000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.magic.lef
index 058a2ee..a5465fc 100644
--- a/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_ms__sdfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfsbp_2 ;
@@ -108,6 +105,22 @@
         RECT 0.000000 -0.245000 17.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.magic.lef
index 7f01043..1c09f8c 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfstp_1 ;
@@ -98,6 +95,23 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.110000 3.520000 ;
+        RECT  7.455000 1.525000  8.515000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.magic.lef
index e61b5bd..a19cc26 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfstp_2 ;
@@ -101,6 +98,22 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.magic.lef
index 0e7b41c..fb3b667 100644
--- a/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ms__sdfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfstp_4 ;
@@ -106,6 +103,22 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.magic.lef
index c5e6af0..eda7caa 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfxbp_1 ;
@@ -95,6 +92,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.magic.lef
index 8a662ec..34d791c 100644
--- a/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_ms__sdfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfxbp_2 ;
@@ -97,6 +94,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.magic.lef
index 7624068..6875aa9 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfxtp_1 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.magic.lef
index ef8c7e0..aeb896c 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfxtp_2 ;
@@ -86,6 +83,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.magic.lef
index 556d0dd..74e3b96 100644
--- a/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ms__sdfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdfxtp_4 ;
@@ -89,6 +86,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.magic.lef
index a0e7cc7..d935cc5 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdlclkp_1 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  3.910000 1.580000 4.980000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.magic.lef
index 843876b..32cf05c 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdlclkp_2 ;
@@ -74,6 +71,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  3.840000 1.560000 5.890000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.magic.lef
index 77d40d2..03128da 100644
--- a/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ms__sdlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sdlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sdlclkp_4 ;
@@ -79,6 +76,24 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  1.385000 1.650000 5.370000 1.660000 ;
+        RECT  4.270000 1.575000 5.370000 1.650000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.magic.lef
index c3e955a..43cd411 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sedfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sedfxbp_1 ;
@@ -102,6 +99,22 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.magic.lef
index b333840..e65d4b8 100644
--- a/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_ms__sedfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sedfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sedfxbp_2 ;
@@ -103,6 +100,22 @@
         RECT 0.000000 -0.245000 17.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.magic.lef
index 735c7b1..ef14622 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sedfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sedfxtp_1 ;
@@ -90,6 +87,23 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.550000 3.520000 ;
+        RECT  6.020000 1.600000  7.080000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.magic.lef
index 13c35fa..8dd714d 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sedfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sedfxtp_2 ;
@@ -93,6 +90,23 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+        RECT  6.200000 1.640000  7.305000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.magic.lef
index 7d322b1..6e01dfa 100644
--- a/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ms__sedfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__sedfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__sedfxtp_4 ;
@@ -96,6 +93,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT  6.115000 1.625000  7.180000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/tap/sky130_fd_sc_ms__tap_1.magic.lef b/cells/tap/sky130_fd_sc_ms__tap_1.magic.lef
index a09ee05..9f4a363 100644
--- a/cells/tap/sky130_fd_sc_ms__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_ms__tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tap_1 ;
@@ -43,6 +40,10 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -67,6 +68,8 @@
     LAYER mcon ;
       RECT 0.155000 -0.085000 0.325000 0.085000 ;
       RECT 0.155000  3.245000 0.325000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 0.670000 3.520000 ;
   END
 END sky130_fd_sc_ms__tap_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_ms__tap_2.magic.lef b/cells/tap/sky130_fd_sc_ms__tap_2.magic.lef
index 9486b67..d5174f4 100644
--- a/cells/tap/sky130_fd_sc_ms__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_ms__tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tap_2 ;
@@ -43,6 +40,10 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.870000 1.440000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -69,6 +70,8 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_ms__tap_2
 END LIBRARY
diff --git a/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.magic.lef
index ea8f919..8c263fb 100644
--- a/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_ms__tapmet1_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tapmet1_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tapmet1_2 ;
@@ -43,6 +40,10 @@
       LAYER met1 ;
         RECT 0.080000 0.425000 0.400000 0.685000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
   END VNB
   PIN VPB
     DIRECTION INOUT ;
@@ -77,6 +78,8 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_ms__tapmet1_2
 END LIBRARY
diff --git a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.magic.lef
index 02fdaf1..5340f07 100644
--- a/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_ms__tapvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tapvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tapvgnd_1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.magic.lef
index ca7a9f4..5f954cc 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_ms__tapvgnd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tapvgnd2_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tapvgnd2_1 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.magic.lef
index 6c11520..3ee6be0 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ms__tapvpwrvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__tapvpwrvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ms__tapvpwrvgnd_1 ;
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.magic.lef
index 0353082..24b5c10 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor2_1 ;
@@ -71,6 +68,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.magic.lef
index dd7ef8c..67ee93b 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor2_2 ;
@@ -83,6 +80,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.magic.lef
index d5c7e62..4a9cd33 100644
--- a/cells/xnor2/sky130_fd_sc_ms__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ms__xnor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor2_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.magic.lef
index 1575903..5990de6 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor3_1 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.magic.lef
index 8c22eab..ca61b6e 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor3_2 ;
@@ -74,6 +71,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.magic.lef
index c56ed93..48bafb6 100644
--- a/cells/xnor3/sky130_fd_sc_ms__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ms__xnor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xnor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xnor3_4 ;
@@ -78,6 +75,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_ms__xor2_1.magic.lef
index 3bbf3bb..d7e085f 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor2_1 ;
@@ -68,6 +65,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_ms__xor2_2.magic.lef
index 2053673..9af26e0 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor2_2 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor2/sky130_fd_sc_ms__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_ms__xor2_4.magic.lef
index dd71a75..aba1b31 100644
--- a/cells/xor2/sky130_fd_sc_ms__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ms__xor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor2_4 ;
@@ -90,6 +87,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_ms__xor3_1.magic.lef
index faf97d0..a2a3847 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor3_1 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_ms__xor3_2.magic.lef
index 8d4612c..4650f99 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor3_2 ;
@@ -72,6 +69,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/xor3/sky130_fd_sc_ms__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_ms__xor3_4.magic.lef
index cc18ac9..c03c0b0 100644
--- a/cells/xor3/sky130_fd_sc_ms__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ms__xor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_ms__xor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_ms__xor3_4 ;
@@ -79,6 +76,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;