diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
index 67ebe4c..ae08723 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111o_1 ;
@@ -76,6 +73,22 @@
         RECT 1.515000 1.290000 1.720000 2.465000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 1.975000 -0.065000 2.145000 0.105000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.504500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
index 319edb1..5ef1929 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111o_2 ;
@@ -76,6 +73,18 @@
         RECT 1.960000 1.325000 2.255000 2.355000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
index 15eaca9..eab93aa 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111o_4 ;
@@ -73,6 +70,18 @@
         RECT 0.085000 0.975000 0.370000 1.625000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
index 4bf89b3..1f4e99e 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111oi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111oi_0 ;
@@ -75,6 +72,18 @@
         RECT 0.085000 0.730000 0.435000 1.655000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
index 43851ea..d7bf60c 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111oi_1 ;
@@ -75,6 +72,22 @@
         RECT 0.785000 1.050000 1.235000 2.455000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 1.975000 -0.065000 2.145000 0.105000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.388750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
index d4135e8..471758a 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111oi_2 ;
@@ -78,6 +75,18 @@
         RECT 0.755000 1.075000 1.425000 1.275000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.212750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
index aa36a97..bb78883 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2111oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2111oi_4 ;
@@ -73,6 +70,18 @@
         RECT 0.495000 1.020000 1.845000 1.275000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.009500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
index 2e93156..47a55bd 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211o_1 ;
@@ -64,6 +61,18 @@
         RECT 2.855000 0.995000 3.125000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.437250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
index 52c6d2a..742a20c 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211o_2 ;
@@ -64,6 +61,18 @@
         RECT 3.260000 1.045000 3.595000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.452000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
index 509d3bf..9fdc28e 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211o_4 ;
@@ -70,6 +67,18 @@
         RECT 2.975000 0.985000 3.645000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.933750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
index 1a5f5ce..f62bcf9 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211oi_1 ;
@@ -66,6 +63,18 @@
         RECT 1.935000 0.995000 2.235000 1.615000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.619250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
index 58b9164..6553f54 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211oi_2 ;
@@ -66,6 +63,18 @@
         RECT 0.100000 0.995000 0.405000 1.615000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.826000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
index 83c15f7..5b888b4 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a211oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a211oi_4 ;
@@ -87,6 +84,18 @@
         RECT 6.130000 1.275000 6.350000 1.695000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.685000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
index db6ecb1..061b969 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21bo_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21bo_1 ;
@@ -55,6 +52,18 @@
         RECT 0.105000 0.325000 0.335000 1.665000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
index 4b69930..1ee3ef5 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21bo_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21bo_2 ;
@@ -56,6 +53,18 @@
         RECT 1.330000 0.995000 1.525000 1.035000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
index e1fdc5f..da98690 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21bo_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21bo_4 ;
@@ -59,6 +56,18 @@
         RECT 0.500000 1.010000 0.830000 1.625000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
index fc01499..4f69f96 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21boi_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21boi_0 ;
@@ -55,6 +52,18 @@
         RECT 0.470000 1.200000 0.895000 1.955000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.392200 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
index 0b0a4d4..e7a789f 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21boi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21boi_1 ;
@@ -56,6 +53,18 @@
         RECT 0.105000 0.975000 0.335000 1.665000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.551000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
index 394ab2b..17496ae 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21boi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21boi_2 ;
@@ -59,6 +56,18 @@
         RECT 0.120000 0.765000 0.425000 1.805000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.627500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
index 606d587..34d79bd 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21boi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21boi_4 ;
@@ -58,6 +55,18 @@
         RECT 0.480000 0.995000 0.650000 1.075000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.288000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
index 04b020a..ed5d787 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21o_1 ;
@@ -56,6 +53,18 @@
         RECT 1.015000 1.015000 1.480000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
index 873aff6..421cc4a 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21o_2 ;
@@ -55,6 +52,18 @@
         RECT 1.465000 0.995000 1.790000 1.410000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
index b126682..ecc36f5 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21o_4 ;
@@ -59,6 +56,18 @@
         RECT 2.395000 0.995000 2.705000 1.525000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
index ea721ce..8cf2b9b 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21oi_1 ;
@@ -56,6 +53,18 @@
         RECT 0.095000 0.675000 0.335000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.447000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
index ce272e2..42bd08a 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21oi_2 ;
@@ -58,6 +55,18 @@
         RECT 2.800000 0.995000 3.075000 1.625000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.627500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
index 43a6623..53b0233 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a21oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a21oi_4 ;
@@ -58,6 +55,18 @@
         RECT 0.090000 1.035000 1.430000 1.415000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.288000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
index 1c4501b..0f651b1 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221o_1 ;
@@ -75,6 +72,18 @@
         RECT 0.090000 1.075000 0.440000 1.285000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
index 93c5156..2dcd539 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221o_2 ;
@@ -75,6 +72,18 @@
         RECT 0.085000 1.075000 0.440000 1.285000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
index 1917280..ad78d41 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221o_4 ;
@@ -75,6 +72,18 @@
         RECT 4.230000 1.075000 4.725000 1.285000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
index a40f4a8..7071095 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221oi_1 ;
@@ -75,6 +72,18 @@
         RECT 0.085000 1.075000 0.435000 1.285000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.767000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
index 8b3da15..2ad1e28 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221oi_2 ;
@@ -78,6 +75,18 @@
         RECT 0.090000 1.075000 0.420000 1.615000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
index 13922c4..a784435 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a221oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a221oi_4 ;
@@ -79,6 +76,18 @@
         RECT 0.090000 1.075000 1.335000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
index 3836412..fda94be 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a222oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a222oi_1 ;
@@ -82,6 +79,18 @@
         RECT 0.715000 1.000000 1.085000 1.315000 ;
     END
   END C2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.680000 0.240000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.897600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
index 467fa3b..05c57b6 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22o_1 ;
@@ -66,6 +63,18 @@
         RECT 0.085000 1.075000 0.575000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
index fc2798c..a4d76fd 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22o_2 ;
@@ -66,6 +63,18 @@
         RECT 0.090000 1.075000 0.575000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
index 6d1bc39..66cf06e 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22o_4 ;
@@ -69,6 +66,18 @@
         RECT 3.850000 1.075000 4.180000 1.445000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
index a443eb8..6e6d3b9 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22oi_1 ;
@@ -66,6 +63,18 @@
         RECT 0.125000 0.765000 0.575000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.858000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
index dd8b346..acd893f 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22oi_2 ;
@@ -64,6 +61,18 @@
         RECT 0.150000 1.075000 0.780000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.141000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
index 2aee4eb..c37d80c 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a22oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a22oi_4 ;
@@ -64,6 +61,18 @@
         RECT 0.090000 1.075000 1.895000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
index 1c81288..d056171 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2o_1 ;
@@ -65,6 +62,18 @@
         RECT 2.820000 0.765000 3.080000 1.355000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
index 7a2fa3b..607ea27 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2o_2 ;
@@ -65,6 +62,18 @@
         RECT 3.270000 0.765000 3.530000 1.355000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
index b81635b..5c7a364 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2o_4 ;
@@ -70,6 +67,18 @@
         RECT 0.805000 1.075000 1.345000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
index 1e2c379..41b6a20 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2oi_1 ;
@@ -65,6 +62,18 @@
         RECT 2.440000 0.425000 2.610000 0.995000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.515500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
index 5769076..eb9f058 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2oi_2 ;
@@ -66,6 +63,18 @@
         RECT 0.940000 1.075000 1.480000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
index 055dd1e..0073f51 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a2bb2oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a2bb2oi_4 ;
@@ -67,6 +64,18 @@
         RECT 1.725000 1.075000 3.075000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
index c9b9f13..752cc72 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311o_1 ;
@@ -74,6 +71,18 @@
         RECT 3.350000 0.995000 3.535000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.454000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
index 8e37839..851b96a 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311o_2 ;
@@ -74,6 +71,18 @@
         RECT 3.695000 0.995000 4.005000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
index e707af1..f294829 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311o_4 ;
@@ -74,6 +71,18 @@
         RECT 0.135000 0.745000 0.350000 1.625000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.904000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
index 4fb50df..4ac1b76 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311oi_1 ;
@@ -78,6 +75,18 @@
         RECT 2.445000 0.995000 2.685000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.659750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
index f6f627f..f460c58 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311oi_2 ;
@@ -74,6 +71,18 @@
         RECT 5.175000 1.295000 5.410000 1.625000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.141000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
index 4e39e02..ff11b0e 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a311oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a311oi_4 ;
@@ -73,6 +70,18 @@
         RECT 7.935000 0.995000 9.530000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.898500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
index 14ddd8f..9b505ed 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31o_1 ;
@@ -65,6 +62,18 @@
         RECT 2.375000 0.995000 2.620000 1.655000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.437250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
index 5ea35a2..abd9bae 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31o_2 ;
@@ -71,6 +68,18 @@
         RECT 2.895000 0.755000 3.090000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
index 08d4761..ce42f07 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31o_4 ;
@@ -71,6 +68,18 @@
         RECT 3.815000 0.745000 4.030000 1.075000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
index 42740d1..d949817 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31oi_1 ;
@@ -65,6 +62,18 @@
         RECT 1.965000 0.995000 2.215000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.481250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
index 40d256b..a1d06dd 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31oi_2 ;
@@ -66,6 +63,18 @@
         RECT 4.265000 1.275000 4.490000 1.625000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.922000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
index f6ee813..a12b3f9 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a31oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a31oi_4 ;
@@ -64,6 +61,18 @@
         RECT 5.670000 0.995000 6.855000 1.630000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.443500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
index b2e2582..46a7e4f 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32o_1 ;
@@ -74,6 +71,18 @@
         RECT 3.325000 1.325000 3.530000 1.615000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.544500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
index 38943d6..b4f685b 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32o_2 ;
@@ -79,6 +76,18 @@
         RECT 1.115000 0.745000 1.530000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.695500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
index a40b474..8d7cdc6 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32o_4 ;
@@ -74,6 +71,18 @@
         RECT 7.030000 1.295000 7.225000 1.635000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
index 03ebda5..1a924be 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32oi_1 ;
@@ -77,6 +74,18 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.575500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
index dce981b..36c5538 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32oi_2 ;
@@ -75,6 +72,18 @@
         RECT 0.145000 1.285000 0.325000 1.625000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
index 6e13ac8..c2bc3c7 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a32oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a32oi_4 ;
@@ -75,6 +72,18 @@
         RECT 0.110000 1.305000 0.330000 1.965000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
index 4f52c99..b82e02e 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41o_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41o_1 ;
@@ -76,6 +73,18 @@
         RECT 1.005000 1.075000 1.335000 1.635000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
index 153039e..fea54a2 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41o_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41o_2 ;
@@ -76,6 +73,18 @@
         RECT 1.400000 1.075000 1.730000 1.295000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
index f890506..b95d9e2 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41o_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41o_4 ;
@@ -73,6 +70,18 @@
         RECT 2.135000 1.075000 3.145000 1.280000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
index 616c0c4..d2b6a31 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41oi_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41oi_1 ;
@@ -73,6 +70,18 @@
         RECT 0.540000 0.965000 0.780000 1.665000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.669500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
index 2709439..cb5e5a6 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41oi_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41oi_2 ;
@@ -73,6 +70,18 @@
         RECT 0.545000 1.075000 1.555000 1.280000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
index 84c456f..b69e1d8 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__a41oi_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__a41oi_4 ;
@@ -74,6 +71,18 @@
         RECT 0.105000 1.305000 0.325000 1.965000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
index f96d810..0666441 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2_0 ;
@@ -46,6 +43,18 @@
         RECT 0.940000 1.080000 1.270000 1.615000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.280900 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
index 2e58311..6fbe58c 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2_1 ;
@@ -47,6 +44,18 @@
         RECT 0.995000 1.075000 1.335000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.657000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
index b6d8848..8a5965b 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2_2 ;
@@ -47,6 +44,18 @@
         RECT 1.005000 1.075000 1.335000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.643500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
index 4bf8e94..b34bc21 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2_4 ;
@@ -46,6 +43,18 @@
         RECT 0.605000 0.995000 0.980000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
index 4d238b4..b6b084b 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2b_1 ;
@@ -46,6 +43,18 @@
         RECT 1.480000 1.645000 2.175000 1.955000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
index 687248a..e9cb712 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2b_2 ;
@@ -46,6 +43,18 @@
         RECT 1.505000 1.645000 2.200000 1.955000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
index 65005b0..f206541 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and2b_4 ;
@@ -48,6 +45,18 @@
         RECT 0.610000 0.995000 0.975000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.934000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
index 7e78fbd..6447a51 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3_1 ;
@@ -56,6 +53,18 @@
         RECT 1.145000 0.790000 1.475000 1.215000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
index 0001558..48a2e43 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3_2 ;
@@ -56,6 +53,18 @@
         RECT 1.065000 0.750000 1.475000 1.245000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
index 7867ff0..00d6020 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3_4 ;
@@ -56,6 +53,18 @@
         RECT 1.525000 0.995000 1.900000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
index 821a5e2..9a33794 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3b_1 ;
@@ -56,6 +53,18 @@
         RECT 1.985000 0.725000 2.395000 1.245000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
index ed1262d..85ec405 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3b_2 ;
@@ -56,6 +53,18 @@
         RECT 2.010000 0.765000 2.420000 1.245000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
index 8411fef..b70e6a6 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and3b_4 ;
@@ -55,6 +52,18 @@
         RECT 1.525000 0.995000 1.715000 1.340000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.934000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
index 81cbd47..ec4529c 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4_1 ;
@@ -64,6 +61,18 @@
         RECT 1.895000 0.355000 2.175000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
index 99ace8f..e05bb9d 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4_2 ;
@@ -65,6 +62,18 @@
         RECT 1.900000 0.415000 2.160000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.544500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
index 5ab0636..00bcb3c 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4_4 ;
@@ -66,6 +63,18 @@
         RECT 1.905000 0.935000 2.075000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
index 12a2ec0..9fe72b5 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4b_1 ;
@@ -64,6 +61,18 @@
         RECT 2.485000 0.665000 2.825000 1.695000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
index 9bac86c..5092e6a 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4b_2 ;
@@ -64,6 +61,18 @@
         RECT 2.445000 0.645000 2.775000 1.615000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.503250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
index b061412..e353a78 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4b_4 ;
@@ -64,6 +61,18 @@
         RECT 2.865000 0.995000 3.085000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
index 603d2fe..d9744f3 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4bb_1 ;
@@ -69,6 +66,18 @@
         RECT 3.350000 1.325000 3.545000 1.635000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.425400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
index cdbd1ca..c0da428 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4bb_2 ;
@@ -64,6 +61,18 @@
         RECT 3.350000 0.425000 3.655000 1.405000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
index 0a14726..735bb72 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__and4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__and4bb_4 ;
@@ -64,6 +61,18 @@
         RECT 2.680000 0.995000 3.080000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
index 4b817b0..48e2519 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_1 ;
@@ -37,6 +34,18 @@
         RECT 0.105000 0.985000 0.445000 1.355000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
index 5eb1ac3..4750d7a 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_12
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_12 ;
@@ -37,6 +34,18 @@
         RECT 0.135000 1.075000 1.660000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.570000 -0.085000 0.740000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  2.673000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
index 4d6f196..e2a0237 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_16 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 2.485000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
index e833eb9..163393d 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.985000 0.440000 1.355000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
index 7efc9c8..c752b6a 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_4 ;
@@ -37,6 +34,18 @@
         RECT 0.090000 1.075000 0.470000 1.315000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
index e4e24df..4a5d0b5 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_6
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_6 ;
@@ -37,6 +34,18 @@
         RECT 0.280000 1.075000 1.185000 1.315000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.336500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
index 8770b01..9983b4b 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__buf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__buf_8 ;
@@ -37,6 +34,18 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
index 8c8a54c..40f7a44 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__bufbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__bufbuf_16 ;
@@ -37,6 +34,18 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
index 6b924f1..d4e4eaa 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__bufbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__bufbuf_8 ;
@@ -37,6 +34,18 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
index c585099..126cff6 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__bufinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__bufinv_16 ;
@@ -37,6 +34,18 @@
         RECT 0.090000 1.075000 1.265000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
index 643cab0..e8fb7c9 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__bufinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__bufinv_8 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 0.505000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
index 4dc0f5a..a6f35a8 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkbuf_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkbuf_1 ;
@@ -37,6 +34,18 @@
         RECT 0.945000 0.985000 1.275000 1.355000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
index 8decc07..08f4e4f 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkbuf_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkbuf_16 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
index 3129783..c3c0dc2 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkbuf_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkbuf_2 ;
@@ -37,6 +34,18 @@
         RECT 0.425000 0.745000 0.785000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.383400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
index 6e1295c..570cfec 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkbuf_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkbuf_4 ;
@@ -37,6 +34,18 @@
         RECT 0.425000 0.755000 0.775000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.795200 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
index fe21e48..da709cd 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkbuf_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkbuf_8 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.590400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
index ef48d0a..7fdd9cf 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s15_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s15_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.055000 0.560000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.376300 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
index a75bf98..082a858 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s15_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s15_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.060000 0.555000 1.625000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.397600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
index c4ec686..373085d 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s18_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s18_1 ;
@@ -37,6 +34,18 @@
         RECT 0.100000 1.055000 0.550000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.376300 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
index 3256865..bdbee7e 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s18_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s18_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 0.560000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.397600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
index 4b1163d..0a47a19 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s25_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s25_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 0.485000 1.320000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.702900 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
index af67972..0be7f12 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s25_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s25_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.995000 0.495000 1.615000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.497000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
index 648eb5d..058c53f 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s50_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s50_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 0.535000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
index c7e7be7..97ec6dd 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkdlybuf4s50_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkdlybuf4s50_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 0.480000 1.285000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.390500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
index e308857..ee27687 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinv_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.336000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
index 49c712a..82e7941 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinv_16 ;
@@ -51,6 +48,18 @@
         RECT 9.285000 1.260000 10.035000 1.305000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  4.520900 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
index f2ea3b3..8f815db 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinv_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.065000 1.305000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.662600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
index 4c3b4a4..154d504 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinv_4 ;
@@ -37,6 +34,18 @@
         RECT 0.445000 1.065000 2.660000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.075200 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
index 5a64149..a414922 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinv_8 ;
@@ -37,6 +34,18 @@
         RECT 0.455000 1.035000 4.865000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.090400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
index 3d97a9e..c4a7523 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinvlp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinvlp_2 ;
@@ -37,6 +34,18 @@
         RECT 0.145000 0.995000 0.600000 1.665000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.436750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
index 8a04812..5e92251 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__clkinvlp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__clkinvlp_4 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.745000 0.425000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.714000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
index 8637306..c7d3fc5 100644
--- a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__conb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__conb_1 ;
@@ -44,6 +41,18 @@
         RECT 0.775000 0.915000 1.295000 2.465000 ;
     END
   END LO
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
index 546fd2c..6692793 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__decap_12
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__decap_12 ;
@@ -28,6 +25,18 @@
   SIZE  5.520000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
index 04b6b78..686e4b2 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__decap_3
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__decap_3 ;
@@ -28,6 +25,18 @@
   SIZE  1.380000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
index 0304fbf..8b9f437 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__decap_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__decap_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
index ff55697..59b2319 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__decap_6
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__decap_6 ;
@@ -28,6 +25,18 @@
   SIZE  2.760000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
index ab58ea6..7759793 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__decap_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__decap_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
index 1371053..2159509 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfbbn_1 ;
@@ -94,6 +91,18 @@
         RECT 7.515000 0.920000 7.805000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
index 3ebb476..a5422e6 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfbbn_2 ;
@@ -94,6 +91,18 @@
         RECT 7.460000 0.920000 7.750000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
index 4ebce31..f09e24b 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfbbp_1 ;
@@ -94,6 +91,18 @@
         RECT 7.450000 0.920000 7.740000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
index 48e359a..96aa781 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrbp_1 ;
@@ -87,6 +84,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
index 5a6b1d1..5cb0a3d 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrbp_2 ;
@@ -87,6 +84,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
index 9e5ed9f..a5a2355 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrtn_1 ;
@@ -77,6 +74,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
index 53b318b..c781af4 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrtp_1 ;
@@ -77,6 +74,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
index fd78abf..f5c6c3f 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrtp_2 ;
@@ -77,6 +74,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
index 3b1f1f1..104efdd 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfrtp_4 ;
@@ -81,6 +78,18 @@
         RECT 7.345000 0.735000 7.635000 0.780000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
index 3660b2b..2d6accc 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfsbp_1 ;
@@ -83,6 +80,18 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
index 46f25c4..b843370 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfsbp_2 ;
@@ -86,6 +83,18 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
index c8d1cb3..dc9c27c 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfstp_1 ;
@@ -74,6 +71,18 @@
         RECT 7.050000 0.920000 7.340000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
index 1176a26..9a0ca4b 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfstp_2 ;
@@ -79,6 +76,18 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
index 53ca529..cdb4ddf 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfstp_4 ;
@@ -80,6 +77,18 @@
         RECT 6.985000 0.920000 7.275000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
index 998e1e3..164e41b 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfxbp_1 ;
@@ -63,6 +60,18 @@
         RECT 8.415000 0.910000 8.650000 1.480000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
index 4fa826d..689f9ee 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfxbp_2 ;
@@ -63,6 +60,18 @@
         RECT 8.930000 0.885000 9.145000 1.495000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
index 1e55d55..b6a493a 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfxtp_1 ;
@@ -52,6 +49,18 @@
         RECT 7.105000 0.865000 7.275000 1.445000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
index c4a1019..123e425 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfxtp_2 ;
@@ -52,6 +49,18 @@
         RECT 7.105000 0.865000 7.275000 1.445000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
index cdd3545..44654c5 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dfxtp_4 ;
@@ -52,6 +49,18 @@
         RECT 8.410000 0.900000 8.655000 1.465000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
index f0536c6..8db36a6 100644
--- a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__diode_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__diode_2 ;
@@ -30,6 +27,7 @@
   SITE unithd ;
   PIN DIODE
     ANTENNADIFFAREA  0.434700 ;
+    ANTENNAGATEAREA  0.434700 ;
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
@@ -37,6 +35,18 @@
         RECT 0.085000 0.255000 0.835000 2.465000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
index 7a7a1b8..62a9fb7 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlclkp_1 ;
@@ -49,6 +46,20 @@
         RECT 6.170000 0.595000 6.355000 1.495000 ;
     END
   END GCLK
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.995000 1.355000 ;
+        RECT -0.190000 1.355000 6.630000 2.910000 ;
+        RECT  2.620000 1.305000 6.630000 1.355000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
index 6b7bc8f..503bbf6 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlclkp_2 ;
@@ -49,6 +46,20 @@
         RECT 6.165000 0.595000 6.360000 1.495000 ;
     END
   END GCLK
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.995000 1.355000 ;
+        RECT -0.190000 1.355000 7.090000 2.910000 ;
+        RECT  2.625000 1.305000 7.090000 1.355000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
index a13a19e..8eb15f2 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlclkp_4 ;
@@ -54,6 +51,18 @@
         RECT 6.970000 2.005000 7.300000 2.465000 ;
     END
   END GCLK
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.406500 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
index 654305c..dd5dedd 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrbn_1 ;
@@ -66,6 +63,18 @@
         RECT 4.470000 0.995000 5.455000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
index b3bd8bb..564a596 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrbn_2 ;
@@ -76,6 +73,18 @@
         RECT 4.390000 0.995000 5.140000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
index 3b90322..d9eb9be 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrbp_1 ;
@@ -66,6 +63,18 @@
         RECT 4.450000 0.995000 5.435000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
index 85facec..bfc7b83 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrbp_2 ;
@@ -74,6 +71,18 @@
         RECT 4.400000 0.995000 5.150000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
index 182ce98..d992c30 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtn_1 ;
@@ -55,6 +52,18 @@
         RECT 4.500000 0.995000 5.435000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
index 017a3b0..5cb5989 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtn_2 ;
@@ -65,6 +62,18 @@
         RECT 4.480000 0.995000 5.170000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
index 065848c..aee05c7 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtn_4 ;
@@ -61,6 +58,18 @@
         RECT 4.505000 0.995000 5.145000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
index bf82ad6..29a7e68 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtp_1 ;
@@ -58,6 +55,18 @@
         RECT 4.745000 0.995000 5.075000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
index 911d47c..803ee92 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtp_2 ;
@@ -66,6 +63,18 @@
         RECT 4.480000 1.035000 5.240000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
index ab3131c..cac1547 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlrtp_4 ;
@@ -61,6 +58,18 @@
         RECT 4.505000 0.995000 5.145000 1.325000 ;
     END
   END RESET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
index f47ef80..3d8fe76 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxbn_1 ;
@@ -59,6 +56,18 @@
         RECT 6.625000 0.825000 6.815000 1.505000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
index c6800dd..4f85c87 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxbn_2 ;
@@ -65,6 +62,18 @@
         RECT 7.095000 1.325000 7.305000 1.445000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
index 9ccc888..2c81eca 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxbp_1 ;
@@ -59,6 +56,18 @@
         RECT 6.600000 0.825000 6.815000 1.445000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
index 3e00274..26a5f4d 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxtn_1 ;
@@ -48,6 +45,18 @@
         RECT 5.265000 0.745000 5.435000 1.670000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
index 507c6eb..4674655 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxtn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxtn_2 ;
@@ -52,6 +49,18 @@
         RECT 5.330000 1.325000 5.500000 1.495000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
index 2c4560e..a9887f5 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxtn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxtn_4 ;
@@ -52,6 +49,18 @@
         RECT 6.115000 1.325000 6.385000 2.455000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
index 6c876aa..5598d43 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlxtp_1 ;
@@ -48,6 +45,18 @@
         RECT 5.265000 0.745000 5.435000 1.670000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
index ab8ab07..efd3fce 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlygate4sd1_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlygate4sd1_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.055000 0.555000 1.615000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
index 21461d5..cca631d 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlygate4sd2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlygate4sd2_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.055000 0.625000 1.615000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
index d692462..839a744 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlygate4sd3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlygate4sd3_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.055000 0.775000 1.615000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
index 1fa7e2f..12350bf 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlymetal6s2s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlymetal6s2s_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.995000 0.570000 1.700000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     ANTENNAGATEAREA  0.126000 ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
index d6a7066..0f78a4d 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlymetal6s4s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlymetal6s4s_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.995000 0.570000 1.700000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     ANTENNAGATEAREA  0.126000 ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
index 3a38cdc..e33d215 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__dlymetal6s6s_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__dlymetal6s6s_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.995000 0.575000 1.700000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
index 177f735..2f7e7c1 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ebufn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ebufn_1 ;
@@ -46,6 +43,18 @@
         RECT 0.910000 1.075000 1.240000 1.630000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.601000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
index 746f9f8..873f054 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ebufn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ebufn_2 ;
@@ -46,6 +43,18 @@
         RECT 0.950000 0.765000 1.280000 1.275000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
index 7336c95..75f0c93 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ebufn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ebufn_4 ;
@@ -46,6 +43,18 @@
         RECT 0.950000 0.765000 1.280000 1.425000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
index 9e37525..0d0ec63 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ebufn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ebufn_8 ;
@@ -48,6 +45,18 @@
         RECT 0.970000 1.325000 1.305000 1.695000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
index d3a41c5..7f993eb 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__edfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__edfxbp_1 ;
@@ -67,6 +64,18 @@
         RECT 9.515000 0.255000 9.845000 1.065000 ;
     END
   END Q_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
index e6a7a56..def28d5 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__edfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__edfxtp_1 ;
@@ -56,6 +53,18 @@
         RECT 10.465000 0.305000 10.795000 2.420000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
index 1535dfd..91266f6 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvn_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvn_0 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.650000 1.725000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.275600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
index 7c33bb6..09d06f4 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvn_1 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.955000 0.510000 1.725000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
index 9a44d00..08e65a1 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvn_2 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.325000 1.385000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.694800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
index 477f1f7..70452a2 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvn_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvn_4 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
index a9301db..049d343 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvn_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvn_8 ;
@@ -46,6 +43,18 @@
         RECT 0.090000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
index 9a9c2ba..19ad140 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvp_1 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.545000 1.725000 ;
     END
   END TE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
index 72c58bb..73886a2 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvp_2 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
index 90752bd..51ad741 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvp_4 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
index 1ac709b..f243206 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__einvp_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__einvp_8 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN Z
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
index 1aec27a..6e0c7df 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fa_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fa_1 ;
@@ -141,6 +138,18 @@
         RECT 6.910000 0.810000 7.240000 1.485000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
index af72037..c24125d 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fa_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fa_2 ;
@@ -153,6 +150,18 @@
         RECT 7.970000 0.905000 8.195000 1.415000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
index f73b9a1..6deeb6e 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fa_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fa_4 ;
@@ -157,6 +154,18 @@
         RECT 9.700000 0.905000 10.035000 1.415000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
index eee0aa6..83d9e0f 100644
--- a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fah_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fah_1 ;
@@ -97,6 +94,18 @@
         RECT 12.110000 0.825000 12.335000 1.785000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
index 6b63bdd..957c986 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fahcin_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fahcin_1 ;
@@ -94,6 +91,18 @@
         RECT 12.125000 0.825000 12.335000 1.785000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
index ae68ff3..6f48b4f 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fahcon_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__fahcon_1 ;
@@ -94,6 +91,18 @@
         RECT 12.135000 0.825000 12.335000 1.785000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
index d1b67c9..7628584 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fill_1
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hd__fill_1 ;
@@ -28,6 +25,18 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.055000 0.260000 0.055000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
index 5595338..61ee73a 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fill_2
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hd__fill_2 ;
@@ -28,6 +25,18 @@
   SIZE  0.920000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.050000 0.315000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
index 4493971..fee7f84 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fill_4
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hd__fill_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.175000 -0.060000 0.285000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
index 24cd3ed..5a73bc7 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__fill_8
   CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hd__fill_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.120000 0.350000 0.050000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
index 1b7d307..b43be3b 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ha_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ha_1 ;
@@ -72,6 +69,18 @@
         RECT 0.090000 1.565000 0.425000 2.415000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
index fdb1b00..4978d22 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ha_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ha_2 ;
@@ -70,6 +67,18 @@
         RECT 0.555000 1.565000 0.885000 2.415000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
index c4a7ca1..1265c67 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__ha_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__ha_4 ;
@@ -92,6 +89,18 @@
         RECT 1.355000 1.565000 1.685000 2.415000 ;
     END
   END SUM
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
index 476474b..23f2454 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_1 ;
@@ -37,6 +34,18 @@
         RECT 0.320000 1.075000 0.650000 1.315000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
index 2f4534e..a520cc8 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_12
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_12 ;
@@ -37,6 +34,18 @@
         RECT 0.680000 1.075000 5.270000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.673000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
index 7fbeeba..2642e54 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_16 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.075000 5.525000 1.315000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  3.564000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
index cbdc838..4156800 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_2 ;
@@ -37,6 +34,18 @@
         RECT 0.105000 1.075000 0.435000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
index 4ff8df9..5780851 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_4 ;
@@ -37,6 +34,18 @@
         RECT 0.105000 1.075000 1.735000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
index b75d0b1..2223d30 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_6
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_6 ;
@@ -37,6 +34,18 @@
         RECT 0.105000 1.075000 2.615000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.336500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
index 67a46eb..0472646 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__inv_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__inv_8 ;
@@ -37,6 +34,18 @@
         RECT 0.680000 1.075000 3.535000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
index 413697a..18c97b7 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_bleeder_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_bleeder_1 ;
@@ -37,6 +34,18 @@
         RECT 0.275000 1.040000 1.975000 1.730000 ;
     END
   END SHORT
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
index 2da249c..bae705c 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkbufkapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkbufkapwr_1 ;
@@ -37,6 +34,18 @@
         RECT 0.945000 0.985000 1.275000 1.355000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.340600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
index 552fa65..3ccf73f 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkbufkapwr_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkbufkapwr_16 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
index 8f7d4d0..e6091a9 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkbufkapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkbufkapwr_2 ;
@@ -37,6 +34,18 @@
         RECT 0.425000 0.745000 0.785000 1.240000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.383400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
index bd30dd6..33cee19 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkbufkapwr_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkbufkapwr_4 ;
@@ -37,6 +34,18 @@
         RECT 0.425000 0.755000 0.775000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.795200 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
index cc0665b..80c30ff 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkbufkapwr_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkbufkapwr_8 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.590400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
index dc883c5..f3e1602 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkinvkapwr_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkinvkapwr_1 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.336000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
index fece187..400e224 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkinvkapwr_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkinvkapwr_16 ;
@@ -51,6 +48,18 @@
         RECT 9.285000 1.260000 10.035000 1.305000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  4.520900 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
index 671e86b..f185070 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkinvkapwr_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkinvkapwr_2 ;
@@ -37,6 +34,18 @@
         RECT 0.085000 1.065000 1.305000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.662600 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
index c56468e..867730a 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkinvkapwr_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkinvkapwr_4 ;
@@ -37,6 +34,18 @@
         RECT 0.445000 1.065000 2.660000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.075200 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
index 2e8ef31..a8946bf 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_clkinvkapwr_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_clkinvkapwr_8 ;
@@ -37,6 +34,18 @@
         RECT 0.455000 1.035000 4.865000 1.290000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.090400 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
index b479f76..f898b32 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_decapkapwr_12
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_decapkapwr_12 ;
@@ -28,6 +25,18 @@
   SIZE  5.520000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
index 6c70f2a..3b4419e 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_decapkapwr_3
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_decapkapwr_3 ;
@@ -28,6 +25,18 @@
   SIZE  1.380000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
index 2e7f192..e3a1a52 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_decapkapwr_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_decapkapwr_4 ;
@@ -28,6 +25,18 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
index 1b5ac0d..816832c 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_decapkapwr_6
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_decapkapwr_6 ;
@@ -28,6 +25,18 @@
   SIZE  2.760000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
index 2a1aa12..a07a788 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_decapkapwr_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_decapkapwr_8 ;
@@ -28,6 +25,18 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
index f9ca6e4..4e6509a 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_inputiso0n_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_inputiso0n_1 ;
@@ -47,6 +44,18 @@
         RECT 0.995000 1.075000 1.335000 1.325000 ;
     END
   END SLEEP_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.657000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
index 40204c7..f114c2f 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_inputiso0p_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_inputiso0p_1 ;
@@ -46,6 +43,18 @@
         RECT 0.145000 0.765000 0.445000 1.615000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
index 3aa6a87..53bbe65 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_inputiso1n_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_inputiso1n_1 ;
@@ -46,6 +43,18 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END SLEEP_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
index 93d192e..e0f879b 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_inputiso1p_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_inputiso1p_1 ;
@@ -46,6 +43,18 @@
         RECT 1.010000 0.765000 1.275000 1.325000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.509000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
index f733e2d..74d86fa 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_inputisolatch_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_inputisolatch_1 ;
@@ -48,6 +45,18 @@
         RECT 4.805000 0.745000 4.975000 1.670000 ;
     END
   END Q
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN SLEEP_B
     ANTENNAGATEAREA  0.145500 ;
     DIRECTION INPUT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
index c34952b..556ad01 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrc_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrc_1 ;
@@ -46,6 +43,18 @@
         RECT 0.960000 1.065000 1.325000 1.325000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
index 9928d9a..e82b805 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrc_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrc_16 ;
@@ -47,6 +44,18 @@
         RECT 9.450000 1.075000 15.650000 1.285000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.750000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  4.968000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
index b41c254..64e271a 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrc_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrc_2 ;
@@ -47,6 +44,18 @@
         RECT 0.480000 1.065000 0.920000 1.275000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
index e271890..6c7c5e5 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrc_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrc_4 ;
@@ -46,6 +43,18 @@
         RECT 0.360000 1.075000 1.800000 1.275000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
index 12b09c6..e9b02c9 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrc_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrc_8 ;
@@ -47,6 +44,18 @@
         RECT 5.270000 1.075000 8.010000 1.275000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  2.484000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
index e62a38d..fe09fde 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_isobufsrckapwr_16 ;
@@ -46,6 +43,22 @@
         RECT 3.260000 1.075000 4.700000 1.275000 ;
     END
   END SLEEP
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 5.205000 -0.085000 5.375000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  3.180800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
index 921f26c..29e561b 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1 ;
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
index 20a6ba6..af47358 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2 ;
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
index e36204a..6cb2f12 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4 ;
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
index 5e7f287..a8d356a 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4 ;
@@ -37,6 +34,18 @@
         RECT 2.970000 1.070000 3.290000 1.540000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.075000 5.245000 0.200000 5.395000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT 4.250000 1.305000 7.405000 4.135000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.072500 ;
     DIRECTION OUTPUT ;
@@ -180,6 +189,9 @@
       RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.305000 0.650000 4.135000 ;
+      RECT  1.920000 1.305000 2.980000 4.135000 ;
   END
 END sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
 END LIBRARY
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
index bfc83ec..d0b963a 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1 ;
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
index 3fd986a..a5553ec 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2 ;
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
index 82cc3ef..2735eaa 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4 ;
diff --git a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
index 779de46..7b95bd3 100644
--- a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
+++ b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__macro_sparecell
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__macro_sparecell ;
@@ -77,6 +74,18 @@
         RECT 8.425000 1.260000 8.715000 1.305000 ;
     END
   END LO
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -288,6 +297,14 @@
       RECT 12.030000 1.075000 12.320000 1.120000 ;
       RECT 12.030000 1.260000 12.320000 1.305000 ;
       RECT 12.470000 1.075000 12.835000 1.305000 ;
+    LAYER pwell ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  3.360000 -0.085000  3.530000 0.085000 ;
+      RECT  5.660000 -0.085000  5.830000 0.085000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  7.510000 -0.085000  7.680000 0.085000 ;
+      RECT  9.810000 -0.085000  9.980000 0.085000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
   END
 END sky130_fd_sc_hd__macro_sparecell
 END LIBRARY
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
index 19b1d5d..0166dc2 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__maj3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__maj3_1 ;
@@ -56,6 +53,18 @@
         RECT 2.415000 0.765000 2.755000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.602250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
index b1b59af..ec2577e 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__maj3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__maj3_2 ;
@@ -57,6 +54,18 @@
         RECT 2.415000 1.415000 3.070000 1.495000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
index 64dc3ac..90cd75b 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__maj3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__maj3_4 ;
@@ -61,6 +58,18 @@
         RECT 2.460000 1.245000 2.630000 2.225000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
index 383fb9c..74a9cbf 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2_1 ;
@@ -61,6 +58,18 @@
         RECT 2.795000 1.630000 2.965000 2.295000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.590000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
index c4d34d9..322f284 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2_2 ;
@@ -58,6 +55,18 @@
         RECT 3.360000 0.755000 3.550000 1.625000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
index c337dfa..62e387b 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2_4 ;
@@ -59,6 +56,18 @@
         RECT 2.680000 0.995000 3.395000 1.325000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
index d338cc3..f372a75 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2_8 ;
@@ -96,6 +93,18 @@
         RECT 9.280000 1.600000 9.570000 1.645000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
index 73021d7..857a3be 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2i_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2i_1 ;
@@ -58,6 +55,18 @@
         RECT 3.260000 0.760000 3.595000 1.620000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.480500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
index 7fa56de..f291930 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2i_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2i_2 ;
@@ -56,6 +53,18 @@
         RECT 0.580000 0.725000 0.780000 0.995000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.691250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
index a51c024..a9ab2eb 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux2i_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux2i_4 ;
@@ -59,6 +56,18 @@
         RECT 7.680000 0.995000 7.850000 1.425000 ;
     END
   END S
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.194500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
index f125f6a..1e5e62b 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux4_1 ;
@@ -82,6 +79,18 @@
         RECT 6.055000 0.995000 6.345000 1.675000 ;
     END
   END S1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
index 8554924..082ca44 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux4_2 ;
@@ -111,6 +108,18 @@
         RECT 2.785000 0.715000 3.075000 1.320000 ;
     END
   END S1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
index 43f53d6..7053e53 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__mux4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__mux4_4 ;
@@ -111,6 +108,18 @@
         RECT 2.790000 0.715000 3.080000 1.320000 ;
     END
   END S1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
index eec8a4f..d4c239b 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2_1 ;
@@ -46,6 +43,18 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
index 7c1ae6c..1d11d2d 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2_2 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 1.075000 0.845000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
index 01f3743..2b905e8 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2_4 ;
@@ -46,6 +43,18 @@
         RECT 0.110000 1.075000 1.730000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
index 1439e3b..7df348d 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2_8 ;
@@ -46,6 +43,18 @@
         RECT 0.510000 1.075000 3.365000 1.295000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.862000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
index cf83336..39111b5 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2b_1 ;
@@ -46,6 +43,18 @@
         RECT 0.610000 1.075000 1.085000 1.315000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
index 4d0766d..66f5f7e 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2b_2 ;
@@ -47,6 +44,18 @@
         RECT 1.990000 1.275000 2.180000 1.655000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.775500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
index 1556a81..74deb84 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand2b_4 ;
@@ -46,6 +43,18 @@
         RECT 3.155000 1.075000 4.940000 1.275000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
index a6e7617..441b1ff 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3_1 ;
@@ -55,6 +52,18 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.699000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
index c2c477f..4594ae8 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3_2 ;
@@ -55,6 +52,18 @@
         RECT 2.470000 1.075000 3.595000 1.275000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
index 0c7e95e..3219d92 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3_4 ;
@@ -55,6 +52,18 @@
         RECT 0.110000 1.075000 1.700000 1.275000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
index 3e21b64..409a08f 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3b_1 ;
@@ -55,6 +52,18 @@
         RECT 0.965000 0.995000 1.235000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.732000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
index 55e2664..fccd6d2 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3b_2 ;
@@ -55,6 +52,18 @@
         RECT 1.060000 1.075000 1.740000 1.275000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
index 7962ee5..ea01851 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand3b_4 ;
@@ -55,6 +52,18 @@
         RECT 4.790000 1.075000 6.500000 1.275000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
index 6cd2b4f..953c8f6 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4_1 ;
@@ -67,6 +64,18 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.795000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
index 59782e6..11a7f03 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4_2 ;
@@ -64,6 +61,18 @@
         RECT 0.110000 1.075000 0.845000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
index c533a23..53a76a4 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4_4 ;
@@ -64,6 +61,18 @@
         RECT 0.105000 1.075000 1.700000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
index f1731ab..c218e31 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4b_1 ;
@@ -64,6 +61,18 @@
         RECT 0.965000 0.995000 1.235000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.887500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
index 5fcc0c7..1bb3141 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4b_2 ;
@@ -64,6 +61,18 @@
         RECT 4.620000 1.075000 5.430000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
index 300b7e7..b28eef2 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4b_4 ;
@@ -64,6 +61,18 @@
         RECT 7.015000 1.075000 8.655000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
index e4637f3..5d7b36f 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4bb_1 ;
@@ -64,6 +61,18 @@
         RECT 0.970000 1.075000 1.320000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.909000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
index 61b96b5..70d1af8 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4bb_2 ;
@@ -66,6 +63,18 @@
         RECT 4.945000 1.075000 5.875000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.255500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
index d3adede..273fbb5 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nand4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nand4bb_4 ;
@@ -64,6 +61,18 @@
         RECT 8.420000 1.075000 10.015000 1.275000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.511000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
index 1cc9d1b..aaadf66 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2_1 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
index 73d11a7..4914234 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2_2 ;
@@ -46,6 +43,18 @@
         RECT 0.980000 1.075000 1.750000 1.275000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
index e934698..78c4cea 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2_4 ;
@@ -46,6 +43,18 @@
         RECT 2.120000 1.075000 3.485000 1.275000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
index 7b31be8..cef5df6 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2_8 ;
@@ -46,6 +43,18 @@
         RECT 3.800000 1.075000 6.540000 1.275000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.484000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
index 094c8f1..0b64bf3 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2b_1 ;
@@ -46,6 +43,18 @@
         RECT 0.100000 0.725000 0.325000 1.325000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.435500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
index 915a82d..620df72 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2b_2 ;
@@ -47,6 +44,18 @@
         RECT 2.910000 1.275000 3.125000 1.965000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.621000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
index bbd2af7..d592c7e 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor2b_4 ;
@@ -46,6 +43,18 @@
         RECT 4.445000 1.075000 4.975000 1.320000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.242000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
index b296b14..18ca3d9 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3_1 ;
@@ -56,6 +53,18 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.604500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
index 0538d3c..db44e08 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3_2 ;
@@ -56,6 +53,18 @@
         RECT 2.375000 1.285000 2.640000 1.625000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
index f72a234..911fa86 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3_4 ;
@@ -59,6 +56,18 @@
         RECT 3.855000 1.075000 4.765000 1.275000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
index a6f1fc2..8db57d6 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3b_1 ;
@@ -55,6 +52,18 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.716500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
index ebede55..26ac90f 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3b_2 ;
@@ -55,6 +52,18 @@
         RECT 4.030000 1.075000 4.515000 1.285000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.796500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
index d512485..d7f2a99 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor3b_4 ;
@@ -55,6 +52,18 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.593000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
index eda56bb..98acec4 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4_1 ;
@@ -67,6 +64,18 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.672750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
index ad7b0de..4494357 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4_2 ;
@@ -64,6 +61,18 @@
         RECT 3.340000 1.075000 3.925000 1.285000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
index e7d520e..fd127e6 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4_4 ;
@@ -64,6 +61,18 @@
         RECT 5.875000 1.075000 7.295000 1.285000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
index 392d93d..41949b2 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4b_1 ;
@@ -64,6 +61,18 @@
         RECT 2.445000 0.995000 2.795000 1.615000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.871000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
index 7894e5f..a220eb0 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4b_2 ;
@@ -65,6 +62,18 @@
         RECT 5.185000 1.285000 5.435000 1.955000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
index d104024..6053618 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4b_4 ;
@@ -64,6 +61,18 @@
         RECT 7.810000 1.075000 8.655000 1.285000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
index 865dd67..62ca55e 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4bb_1 ;
@@ -67,6 +64,18 @@
         RECT 0.950000 0.995000 1.240000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.606900 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
index c55719c..fd0dea0 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4bb_2 ;
@@ -64,6 +61,18 @@
         RECT 0.425000 0.995000 0.780000 1.695000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.972000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
index 806f467..36f960f 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__nor4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__nor4bb_4 ;
@@ -64,6 +61,18 @@
         RECT 0.955000 1.075000 1.295000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.944000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
index 66d1889..4af9d9b 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111a_1 ;
@@ -76,6 +73,18 @@
         RECT 1.535000 0.390000 1.745000 1.075000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
index 4e72ce1..9587e2e 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111a_2 ;
@@ -75,6 +72,18 @@
         RECT 1.505000 1.075000 1.835000 1.615000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
index 0b38cc8..8e9d4bd 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111a_4 ;
@@ -83,6 +80,18 @@
         RECT 0.120000 0.995000 0.340000 1.655000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.962500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
index a8a3c61..106e518 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111ai_1 ;
@@ -74,6 +71,18 @@
         RECT 0.485000 1.075000 0.815000 1.615000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.857250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
index f45276a..35e66ad 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111ai_2 ;
@@ -73,6 +70,18 @@
         RECT 0.085000 1.075000 0.425000 1.355000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.302000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
index a0d989a..86d41df 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2111ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2111ai_4 ;
@@ -73,6 +70,18 @@
         RECT 0.545000 1.075000 1.755000 1.345000 ;
     END
   END D1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.984350 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
index c2efa28..6e52b0b 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211a_1 ;
@@ -64,6 +61,18 @@
         RECT 3.245000 1.075000 3.595000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
index c9f3322..9f8313b 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211a_2 ;
@@ -64,6 +61,18 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
index 3819ee1..9ba70a9 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211a_4 ;
@@ -68,6 +65,18 @@
         RECT 3.055000 1.035000 3.740000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.911000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
index 8dd6cda..40e840d 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211ai_1 ;
@@ -66,6 +63,18 @@
         RECT 1.970000 1.075000 2.300000 1.615000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.418250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
index 48426ab..00ed08c 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211ai_2 ;
@@ -66,6 +63,18 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.022000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
index a0ed9bf..914eace 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o211ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o211ai_4 ;
@@ -70,6 +67,18 @@
         RECT 5.370000 1.075000 6.440000 1.345000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.001000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
index 872ca70..5472d58 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21a_1 ;
@@ -58,6 +55,18 @@
         RECT 1.065000 1.075000 1.535000 1.305000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
index 2b62b81..3c96400 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21a_2 ;
@@ -56,6 +53,18 @@
         RECT 1.445000 1.010000 1.855000 1.615000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
index a98343f..b629a1e 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21a_4 ;
@@ -57,6 +54,18 @@
         RECT 2.485000 1.075000 3.155000 1.615000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
index 6ca93e6..1c34fa7 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ai_0 ;
@@ -56,6 +53,18 @@
         RECT 1.515000 1.355000 1.730000 1.685000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.290500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
index e300749..af8a738 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ai_1 ;
@@ -56,6 +53,18 @@
         RECT 1.505000 1.295000 1.750000 1.655000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.517000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
index 6048a99..c369c4e 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ai_2 ;
@@ -57,6 +54,18 @@
         RECT 2.815000 0.765000 3.130000 1.400000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.742000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
index 8518ddf..076ea5c 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ai_4 ;
@@ -58,6 +55,18 @@
         RECT 3.905000 1.015000 5.255000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.484000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
index 807d811..84396e9 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ba_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ba_1 ;
@@ -55,6 +52,18 @@
         RECT 1.030000 0.995000 1.360000 1.325000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
index 9581998..7b64e84 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ba_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ba_2 ;
@@ -56,6 +53,18 @@
         RECT 0.595000 1.325000 0.775000 1.695000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
index fe16d8f..cfbad32 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21ba_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21ba_4 ;
@@ -56,6 +53,18 @@
         RECT 0.605000 1.285000 0.885000 1.705000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
index 6901de5..a1acc94 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21bai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21bai_1 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.474000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
index 106a595..7950cbf 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21bai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21bai_2 ;
@@ -55,6 +52,18 @@
         RECT 0.085000 0.995000 0.525000 1.325000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
index 94ced46..95aedeb 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o21bai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o21bai_4 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 1.075000 0.555000 1.285000 ;
     END
   END B1_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
index 0321f59..69bb6ec 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221a_1 ;
@@ -75,6 +72,18 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
index c3d7851..6078448 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221a_2 ;
@@ -75,6 +72,18 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
index a4be62d..9a5568b 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221a_4 ;
@@ -78,6 +75,18 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
index 5960718..6743202 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221ai_1 ;
@@ -76,6 +73,18 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.899000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
index 8713178..2c7dabc 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221ai_2 ;
@@ -78,6 +75,18 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.985500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
index e5d3e3a..5beb7a7 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o221ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o221ai_4 ;
@@ -79,6 +76,18 @@
         RECT 0.090000 1.075000 1.750000 1.275000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.971000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
index 035e9c0..4df64ee 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22a_1 ;
@@ -67,6 +64,18 @@
         RECT 1.530000 1.075000 1.995000 1.325000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
index e2781b5..a6a5d05 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22a_2 ;
@@ -68,6 +65,18 @@
         RECT 1.960000 1.075000 2.425000 1.325000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.085000 0.300000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
index 6c3f3b8..eecda1d 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22a_4 ;
@@ -69,6 +66,18 @@
         RECT 3.125000 1.075000 3.680000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
index 7e29774..3364f4c 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22ai_1 ;
@@ -68,6 +65,18 @@
         RECT 0.835000 1.415000 1.235000 1.665000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.650250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
index 5333f26..13bcef4 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22ai_2 ;
@@ -64,6 +61,18 @@
         RECT 1.155000 1.075000 1.925000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
index 9fbdb3d..b8dd2a2 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o22ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o22ai_4 ;
@@ -70,6 +67,18 @@
         RECT 5.110000 1.075000 6.460000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
index 9452814..85b731c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2a_1 ;
@@ -67,6 +64,18 @@
         RECT 2.905000 1.325000 3.080000 2.425000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
index 660b380..9cce33f 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2a_2 ;
@@ -68,6 +65,18 @@
         RECT 3.355000 1.325000 3.525000 2.425000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
index 5a688f0..a0cd82c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2a_4 ;
@@ -68,6 +65,18 @@
         RECT 0.805000 1.075000 1.345000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
index e94e026..59446fb 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2ai_1 ;
@@ -66,6 +63,18 @@
         RECT 2.445000 1.325000 2.615000 2.425000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
index 1962998..55e652b 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2ai_2 ;
@@ -68,6 +65,18 @@
         RECT 3.960000 1.075000 4.500000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
index 2a601e5..d96edfe 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o2bb2ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o2bb2ai_4 ;
@@ -64,6 +61,18 @@
         RECT 6.465000 1.075000 7.875000 1.285000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
index e5c2df6..34faf0c 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311a_1 ;
@@ -75,6 +72,18 @@
         RECT 3.350000 0.995000 3.595000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.429000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
index 91ac14a..2ff4f47 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311a_2 ;
@@ -75,6 +72,18 @@
         RECT 3.810000 0.995000 4.055000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
index ce9a9a0..6239958 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311a_4 ;
@@ -73,6 +70,18 @@
         RECT 2.115000 1.055000 3.080000 1.315000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
index 2dc5f7f..91ae724 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311ai_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311ai_0 ;
@@ -74,6 +71,18 @@
         RECT 2.830000 0.765000 3.135000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.604000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
index 319535d..a956607 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311ai_1 ;
@@ -73,6 +70,18 @@
         RECT 2.830000 0.995000 3.135000 1.325000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.942000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
index 7b608eb..ce7c34d 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311ai_2 ;
@@ -73,6 +70,18 @@
         RECT 5.085000 1.055000 5.895000 1.315000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.551000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
index b3c9211..e37e653 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o311ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o311ai_4 ;
@@ -73,6 +70,18 @@
         RECT 7.865000 1.055000 9.090000 1.315000 ;
     END
   END C1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  2.241000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
index f681611..297e51a 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31a_1 ;
@@ -65,6 +62,18 @@
         RECT 2.390000 0.995000 2.795000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.594000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
index db1c485..f61a0e1 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31a_2 ;
@@ -65,6 +62,18 @@
         RECT 2.855000 0.995000 3.255000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.577500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
index 45effc1..d2c3545 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31a_4 ;
@@ -68,6 +65,18 @@
         RECT 2.780000 1.355000 3.150000 1.695000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
index c2b286a..30bd3c1 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31ai_1 ;
@@ -65,6 +62,18 @@
         RECT 2.330000 0.995000 2.675000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.006000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
index a903b67..9b8cb56 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31ai_2 ;
@@ -64,6 +61,18 @@
         RECT 4.175000 0.755000 4.515000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.063500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
index 21e9a6a..cd094ba 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o31ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o31ai_4 ;
@@ -64,6 +61,18 @@
         RECT 6.465000 1.055000 7.735000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.683800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
index 369c8c5..441cd73 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32a_1 ;
@@ -75,6 +72,18 @@
         RECT 2.440000 0.995000 2.795000 1.660000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.504000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
index 8e4dc57..5bc13c5 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32a_2 ;
@@ -74,6 +71,18 @@
         RECT 2.910000 0.995000 3.155000 1.615000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
index a8b1593..f6e3ddf 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32a_4 ;
@@ -73,6 +70,18 @@
         RECT 4.790000 1.075000 5.260000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
index 4b91a74..d2dc5eb 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32ai_1 ;
@@ -74,6 +71,18 @@
         RECT 0.870000 0.995000 1.240000 1.615000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.821250 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
index abc7f1b..fdf3583 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32ai_2 ;
@@ -73,6 +70,18 @@
         RECT 0.090000 1.075000 0.845000 1.325000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
index 3975bbe..4656746 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o32ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o32ai_4 ;
@@ -73,6 +70,18 @@
         RECT 0.110000 1.075000 1.685000 1.275000 ;
     END
   END B2
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
index df7f8bc..8a00992 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41a_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41a_1 ;
@@ -73,6 +70,18 @@
         RECT 1.275000 1.075000 1.695000 1.285000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.672000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
index 2edd491..e54cf6d 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41a_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41a_2 ;
@@ -73,6 +70,18 @@
         RECT 1.775000 1.075000 2.155000 1.325000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
index 9960868..59c1f77 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41a_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41a_4 ;
@@ -73,6 +70,18 @@
         RECT 2.835000 1.075000 3.165000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
index 7557092..d7eb158 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41ai_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41ai_1 ;
@@ -76,6 +73,18 @@
         RECT 0.105000 1.075000 0.440000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
index a93009c..58a6abc 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41ai_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41ai_2 ;
@@ -73,6 +70,18 @@
         RECT 0.105000 1.075000 0.440000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.715500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
index ffc329c..4d753e6 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__o41ai_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__o41ai_4 ;
@@ -73,6 +70,18 @@
         RECT 0.105000 1.075000 1.700000 1.275000 ;
     END
   END B1
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.431000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
index 6d7d1c0..b7b993e 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2_0
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2_0 ;
@@ -46,6 +43,18 @@
         RECT 0.145000 0.995000 0.500000 1.615000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.326800 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
index e32fc4c..b03d0a0 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2_1 ;
@@ -46,6 +43,18 @@
         RECT 0.145000 0.765000 0.500000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.509000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
index e8b5ad4..610cf1e 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2_2 ;
@@ -46,6 +43,18 @@
         RECT 0.150000 0.765000 0.345000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
index 385a079..148c605 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2_4 ;
@@ -46,6 +43,18 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
index 79ba994..5f5724b 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2b_1 ;
@@ -46,6 +43,18 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
index 481065a..72c44d8 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2b_2 ;
@@ -46,6 +43,18 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
index 380774e..7ae3fdc 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or2b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or2b_4 ;
@@ -46,6 +43,18 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
index 2effb5b..46c9f30 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3_1 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.462000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
index 708e37f..815e886 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3_2 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 0.995000 0.435000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
index 52b3dc5..f6f9fbe 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3_4 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
index 3cf7675..7b999cc 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3b_1 ;
@@ -56,6 +53,18 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
index 880769c..255bf76 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3b_2 ;
@@ -55,6 +52,18 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
index 6a5154f..eca80d2 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or3b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or3b_4 ;
@@ -56,6 +53,18 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
index 7e0ece7..4c3b13e 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4_1 ;
@@ -64,6 +61,18 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
index a75ef26..5c53fbd 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4_2 ;
@@ -64,6 +61,18 @@
         RECT 0.085000 0.755000 0.440000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
index dc1ee8a..4b68394 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4_4 ;
@@ -68,6 +65,18 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
index 5944af8..001e1c9 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4b_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4b_1 ;
@@ -64,6 +61,18 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
index a97c9a1..6518808 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4b_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4b_2 ;
@@ -64,6 +61,18 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
index 0a28dcf..b9a127e 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4b_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4b_4 ;
@@ -68,6 +65,18 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
index 72b926a..a8faaf4 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4bb_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4bb_1 ;
@@ -64,6 +61,18 @@
         RECT 0.945000 0.995000 1.235000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.453750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
index f875bb6..fedf267 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4bb_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4bb_2 ;
@@ -64,6 +61,18 @@
         RECT 0.950000 0.995000 1.240000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
index ba899d0..03a2f22 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__or4bb_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__or4bb_4 ;
@@ -67,6 +64,18 @@
         RECT 0.945000 0.995000 1.235000 1.325000 ;
     END
   END D_N
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
index 1932edf..6b01c51 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__probe_p_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__probe_p_8 ;
@@ -37,6 +34,18 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
index 6a6933f..cd786c6 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__probec_p_8
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__probec_p_8 ;
@@ -37,6 +34,18 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.782000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
index 30b40dd..be75c76 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfbbn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfbbn_1 ;
@@ -116,6 +113,18 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
index 2d32181..3d36fcf 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfbbn_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfbbn_2 ;
@@ -114,6 +111,18 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.370000 2.910000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
index 2f5a79d..b8b4f8a 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfbbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfbbp_1 ;
@@ -114,6 +111,18 @@
         RECT 9.745000 0.920000 10.035000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
index ac6f119..19c3cfe 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrbp_1 ;
@@ -109,6 +106,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.405000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
index 3ca48f4..2add686 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrbp_2 ;
@@ -107,6 +104,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.530000 2.910000 ;
+        RECT  4.405000 1.305000 13.530000 1.425000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
index 73eeb54..ed5743c 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrtn_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrtn_1 ;
@@ -98,6 +95,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 11.690000 2.910000 ;
+        RECT  4.405000 1.305000 11.690000 1.425000 ;
+    END
+  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
index e7a4870..7ea5b1e 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrtp_1 ;
@@ -98,6 +95,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 11.690000 2.910000 ;
+        RECT  4.405000 1.305000 11.690000 1.425000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
index e7e32c7..1ac0744 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrtp_2 ;
@@ -98,6 +95,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 12.150000 2.910000 ;
+        RECT  4.405000 1.305000 12.150000 1.425000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
index 66e386b..43094d3 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfrtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfrtp_4 ;
@@ -102,6 +99,20 @@
         RECT 1.485000 1.070000 1.730000 1.985000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  1.970000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.405000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.247500 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
index 91588ea..3be9fbd 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfsbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfsbp_1 ;
@@ -115,6 +112,18 @@
         RECT 8.825000 1.600000 9.115000 1.645000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
index 5f7ac50..c9bcd41 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfsbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfsbp_2 ;
@@ -115,6 +112,18 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
index 3ae5e9d..41e4e2d 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfstp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfstp_1 ;
@@ -106,6 +103,18 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
index 6412432..8baa341 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfstp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfstp_2 ;
@@ -106,6 +103,18 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
index 1471102..4842b92 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfstp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfstp_4 ;
@@ -110,6 +107,18 @@
         RECT 8.880000 1.600000 9.170000 1.645000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.990000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
index e940211..534879f 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfxbp_1 ;
@@ -101,6 +98,18 @@
         RECT 3.065000 0.785000 3.235000 1.115000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
index 7513f23..b541d8d 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfxbp_2 ;
@@ -84,6 +81,18 @@
         RECT 3.085000 0.785000 3.255000 1.115000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
index 7c8b9e7..9bd5f07 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfxtp_1 ;
@@ -71,6 +68,18 @@
         RECT 3.065000 0.785000 3.250000 1.095000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
index cd102f4..b173147 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfxtp_2 ;
@@ -69,6 +66,18 @@
         RECT 3.080000 0.785000 3.250000 1.115000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
index 08979de..7781695 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdfxtp_4 ;
@@ -73,6 +70,18 @@
         RECT 3.085000 0.785000 3.255000 1.115000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
index 0e3aaf0..17353e6 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdlclkp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdlclkp_1 ;
@@ -59,6 +56,18 @@
         RECT 0.085000 0.955000 0.340000 1.665000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
index e76efd7..deefc79 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdlclkp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdlclkp_2 ;
@@ -60,6 +57,18 @@
         RECT 0.085000 0.955000 0.340000 1.665000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.318000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
index 9168cb2..1acf02d 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sdlclkp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sdlclkp_4 ;
@@ -65,6 +62,18 @@
         RECT 0.085000 0.955000 0.345000 1.665000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.406500 ;
     DIRECTION INPUT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
index 06fe9b1..62b30ba 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sedfxbp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sedfxbp_1 ;
@@ -85,6 +82,20 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 14.450000 2.910000 ;
+        RECT  7.200000 1.305000 14.450000 1.435000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
index 9551085..edd137c 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sedfxbp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sedfxbp_2 ;
@@ -85,6 +82,20 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 15.370000 2.910000 ;
+        RECT  7.200000 1.305000 15.370000 1.435000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
index 059c7ad..f33a927 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sedfxtp_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sedfxtp_1 ;
@@ -74,6 +71,20 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 13.530000 2.910000 ;
+        RECT  7.200000 1.305000 13.530000 1.435000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
index a030a01..89f7d1e 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sedfxtp_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sedfxtp_2 ;
@@ -74,6 +71,20 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 13.990000 2.910000 ;
+        RECT  7.200000 1.305000 13.990000 1.435000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
index 3269cd4..8fb5424 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__sedfxtp_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__sedfxtp_4 ;
@@ -78,6 +75,20 @@
         RECT 5.025000 1.105000 5.250000 1.615000 ;
     END
   END SCE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  4.885000 1.435000 ;
+        RECT -0.190000 1.435000 14.910000 2.910000 ;
+        RECT  7.200000 1.305000 14.910000 1.435000 ;
+    END
+  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.159000 ;
     DIRECTION INPUT ;
diff --git a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
index 06c4afb..1dd776e 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__tap_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__tap_1 ;
diff --git a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
index ceab564..e9ab2d6 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__tap_2
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__tap_2 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
index 68d3e11..8fd2bc1 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__tapvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__tapvgnd_1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
index e8feb2b..42e1a1b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__tapvgnd2_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__tapvgnd2_1 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
index af2388e..60fc040 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__tapvpwrvgnd_1
   CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hd__tapvpwrvgnd_1 ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
index e98cbad..495642b 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor2_1 ;
@@ -49,6 +46,18 @@
         RECT 1.795000 1.245000 1.965000 1.445000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.525000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
index d8031a8..e98e093 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor2_2 ;
@@ -50,6 +47,18 @@
         RECT 2.930000 1.285000 3.100000 1.445000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  0.913000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
index bd5d75c..8c5e0df 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor2_4 ;
@@ -50,6 +47,18 @@
         RECT 5.560000 1.275000 5.730000 1.445000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN Y
     ANTENNADIFFAREA  1.721000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
index 4767815..ed76819 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor3_1 ;
@@ -56,6 +53,18 @@
         RECT 1.615000 1.075000 2.180000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
index 848c082..6e00c3e 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor3_2 ;
@@ -56,6 +53,18 @@
         RECT 2.075000 1.075000 2.640000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
index 8f3d6c0..2982b01 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xnor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xnor3_4 ;
@@ -56,6 +53,18 @@
         RECT 2.995000 1.075000 3.560000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
index 55ab77a..e82549d 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor2_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor2_1 ;
@@ -49,6 +46,18 @@
         RECT 1.560000 1.245000 1.730000 1.445000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.800500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
index 4cf5c6d..746330c 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor2_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor2_2 ;
@@ -66,6 +63,18 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.656750 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
index 7084e66..2957cf2 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor2_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor2_4 ;
@@ -51,6 +48,18 @@
         RECT 2.970000 1.105000 5.740000 1.275000 ;
     END
   END B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  1.524450 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
index 8cc657d..d0002bb 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor3_1
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor3_1 ;
@@ -56,6 +53,18 @@
         RECT 1.860000 0.995000 2.495000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
index 5c9f79d..fe9cffe 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor3_2
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor3_2 ;
@@ -56,6 +53,18 @@
         RECT 2.320000 0.995000 2.955000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
index 2901d28..ca82e0b 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hd__xor3_4
   CLASS CORE ;
   FOREIGN sky130_fd_sc_hd__xor3_4 ;
@@ -56,6 +53,18 @@
         RECT 2.880000 0.995000 3.515000 1.325000 ;
     END
   END C
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.235000 -0.085000 0.405000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN X
     ANTENNADIFFAREA  0.891000 ;
     DIRECTION OUTPUT ;