diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
index 8755a80..14a35f5 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
@@ -27,6 +27,7 @@
   SITE unit ;
   PIN A
     ANTENNAGATEAREA  2.016000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -35,27 +36,16 @@
   END A
   PIN TE_B
     ANTENNAGATEAREA  0.630000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
         RECT 0.115000 1.180000 0.445000 1.515000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 24.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 25.150000 3.520000 ;
-        RECT 11.730000 1.345000 20.980000 1.655000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  5.250200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -85,6 +75,23 @@
         RECT 0.000000 -0.245000 24.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 24.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 25.150000 3.520000 ;
+        RECT 11.730000 1.345000 20.980000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
index d0f5f19..0741480 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
@@ -27,6 +27,7 @@
   SITE unit ;
   PIN A
     ANTENNAGATEAREA  2.016000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -35,27 +36,16 @@
   END A
   PIN TE_B
     ANTENNAGATEAREA  0.630000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
         RECT 0.115000 1.180000 0.445000 1.515000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 24.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 25.150000 3.520000 ;
-        RECT 11.730000 1.345000 20.980000 1.655000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  5.250200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -84,6 +74,23 @@
         RECT 0.000000 -0.245000 24.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 24.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 25.150000 3.520000 ;
+        RECT 11.730000 1.345000 20.980000 1.655000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
index 1bb73d3..3fceb21 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
@@ -27,6 +27,7 @@
   SITE unit ;
   PIN A
     ANTENNAGATEAREA  1.260000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -36,6 +37,7 @@
   END A
   PIN TE_B
     ANTENNAGATEAREA  0.630000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -53,20 +55,9 @@
         RECT 5.815000 0.995000 6.215000 1.325000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 17.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 17.950000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  4.968000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER met1 ;
@@ -81,6 +72,22 @@
         RECT 0.000000 -0.245000 17.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
index 8a107f1..c26dba5 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
@@ -27,26 +27,16 @@
   SITE unit ;
   PIN A
     ANTENNAGATEAREA  0.126000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
         RECT 0.635000 0.840000 0.875000 1.750000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.222600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -61,6 +51,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
index 67e0e2a..10c176a 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
@@ -25,18 +25,6 @@
   SIZE  5.760000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
index 895e750..446cb38 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.440000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
index 1eac5ec..737cfdb 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
index aec7f66..85d5e28 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
@@ -25,18 +25,6 @@
   SIZE  2.880000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
index be89916..323d0c7 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
index 16b38ed..9a8ff9e 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
@@ -25,18 +25,6 @@
   SIZE  5.760000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
index 4f5bf5e..d900def 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.440000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
index ed3fab9..1b106e3 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
index e85a9e2..123748a 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
@@ -25,18 +25,6 @@
   SIZE  2.880000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
index c739090..e160e0c 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN KAPWR
     DIRECTION INOUT ;
     USE POWER ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
index 8321c43..334f0c6 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
@@ -33,18 +33,6 @@
         RECT 0.090000 0.255000 0.870000 3.075000 ;
     END
   END DIODE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
index b352258..ee0be0c 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
@@ -33,18 +33,6 @@
         RECT 0.090000 0.255000 0.870000 3.075000 ;
     END
   END DIODE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -53,6 +41,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
index c2999d0..ed87b51 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.480000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 0.670000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
index 3324c48..c5c7f35 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
index 8ce3bfc..45b63c9 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
index 86ce0c3..a280252 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
@@ -45,6 +33,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
index c43e88e..2883bd7 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
@@ -63,6 +63,15 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
+      LAYER met1 ;
+        RECT 0.000000 2.800000 0.500000 3.085000 ;
+        RECT 0.000000 3.085000 7.680000 3.575000 ;
+    END
+  END VPB
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 3.245000 7.680000 3.415000 ;
         RECT 0.170000 1.920000 0.465000 3.245000 ;
@@ -92,15 +101,6 @@
         RECT 6.875000 3.245000 7.045000 3.415000 ;
         RECT 7.355000 3.245000 7.525000 3.415000 ;
     END
-  END VPB
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE POWER ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.800000 0.500000 3.085000 ;
-        RECT 0.000000 3.085000 7.680000 3.575000 ;
-    END
   END VPWR
   OBS
     LAYER li1 ;
@@ -161,6 +161,8 @@
       RECT 6.700000  1.950000 6.870000 2.120000 ;
       RECT 6.875000 -0.085000 7.045000 0.085000 ;
       RECT 7.355000 -0.085000 7.525000 0.085000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.655000 7.870000 3.520000 ;
   END
 END sky130_fd_sc_lp__inv_16
 END LIBRARY
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
index d5dc0f6..e55adb5 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
@@ -53,6 +53,7 @@
     END
   END X
   PIN KAGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
index d494e43..e6e9f78 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
@@ -55,6 +55,7 @@
     END
   END X
   PIN KAGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
index f9fa273..9db7712 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
@@ -53,6 +53,7 @@
     END
   END X
   PIN KAGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
index 856852f..e0e77ed 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
@@ -55,6 +55,7 @@
     END
   END X
   PIN KAGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
index 456e6ad..e12d9b0 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
@@ -60,6 +60,8 @@
       LAYER li1 ;
         RECT 0.090000 5.220000 0.390000 6.395000 ;
         RECT 4.410000 5.220000 4.710000 6.395000 ;
+      LAYER nwell ;
+        RECT -0.025000 4.985000 4.825000 6.850000 ;
     END
   END DESTVPB
   PIN VGND
@@ -68,6 +70,11 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
+      LAYER pwell ;
+        RECT 0.155000 2.185000 0.325000 3.010000 ;
+        RECT 0.155000 3.650000 0.325000 4.475000 ;
+        RECT 4.475000 2.185000 4.645000 3.010000 ;
+        RECT 4.475000 3.650000 4.645000 4.475000 ;
     END
   END VGND
   PIN VPB
@@ -77,6 +84,8 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
         RECT 4.410000 0.265000 4.710000 1.440000 ;
+      LAYER nwell ;
+        RECT -0.025000 -0.190000 4.825000 1.675000 ;
     END
   END VPB
   PIN VPWR
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
index ef16064..e3932ff 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
@@ -72,6 +72,8 @@
       LAYER li1 ;
         RECT 0.090000 5.220000 0.390000 6.395000 ;
         RECT 6.330000 5.220000 6.630000 6.395000 ;
+      LAYER nwell ;
+        RECT -0.025000 4.985000 6.745000 6.850000 ;
     END
   END DESTVPB
   PIN VGND
@@ -80,6 +82,11 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.075000 6.720000 3.565000 ;
+      LAYER pwell ;
+        RECT 0.155000 2.185000 0.325000 3.010000 ;
+        RECT 0.155000 3.650000 0.325000 4.475000 ;
+        RECT 6.395000 2.185000 6.565000 3.010000 ;
+        RECT 6.395000 3.650000 6.565000 4.475000 ;
     END
   END VGND
   PIN VPB
@@ -89,6 +96,8 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
         RECT 6.330000 0.265000 6.630000 1.440000 ;
+      LAYER nwell ;
+        RECT -0.025000 -0.190000 6.745000 1.675000 ;
     END
   END VPB
   PIN VPWR
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
index 9728416..92a2c26 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
@@ -72,6 +72,8 @@
       LAYER li1 ;
         RECT 0.090000 5.220000 0.390000 6.395000 ;
         RECT 6.810000 5.220000 7.110000 6.395000 ;
+      LAYER nwell ;
+        RECT -0.025000 4.985000 7.225000 6.850000 ;
     END
   END DESTVPB
   PIN VGND
@@ -80,6 +82,11 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.075000 7.200000 3.565000 ;
+      LAYER pwell ;
+        RECT 0.155000 2.185000 0.325000 3.010000 ;
+        RECT 0.155000 3.650000 0.325000 4.475000 ;
+        RECT 6.875000 2.185000 7.045000 3.010000 ;
+        RECT 6.875000 3.650000 7.045000 4.475000 ;
     END
   END VGND
   PIN VPB
@@ -89,6 +96,8 @@
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
         RECT 6.810000 0.265000 7.110000 1.440000 ;
+      LAYER nwell ;
+        RECT -0.025000 -0.190000 7.225000 1.675000 ;
     END
   END VPB
   PIN VPWR
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
index 445207d..24a204d 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
@@ -27,6 +27,7 @@
   SITE unit ;
   PIN A
     ANTENNAGATEAREA  0.189000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -36,26 +37,16 @@
   END A
   PIN B
     ANTENNAGATEAREA  0.189000 ;
+    DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
         RECT 0.105000 0.955000 0.400000 2.890000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.655000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.237300 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
@@ -73,6 +64,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE POWER ;
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
index f8ce2ac..3ac0e7b 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
@@ -101,5 +101,11 @@
         RECT 2.075000 3.245000 2.245000 3.415000 ;
     END
   END VPWR
+  OBS
+    LAYER nwell ;
+      RECT -0.190000 1.655000 2.590000 3.520000 ;
+    LAYER pwell ;
+      RECT 0.000000 0.000000 2.400000 0.245000 ;
+  END
 END sky130_fd_sc_lp__nor2_lp
 END LIBRARY
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
index 83f92c5..2b9ed90 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
@@ -326,6 +326,13 @@
       RECT 4.895000 1.365000 5.185000 1.410000 ;
       RECT 9.695000 1.180000 9.985000 1.225000 ;
       RECT 9.695000 1.365000 9.985000 1.410000 ;
+    LAYER nwell ;
+      RECT -0.190000 1.655000 11.320000 2.075000 ;
+      RECT -0.190000 2.075000 16.030000 3.520000 ;
+      RECT 12.590000 1.605000 14.370000 1.655000 ;
+      RECT 12.590000 1.655000 16.030000 2.075000 ;
+    LAYER pwell ;
+      RECT 0.000000 0.000000 15.840000 0.245000 ;
   END
 END sky130_fd_sc_lp__sdfbbp_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
index e08da7b..d83797a 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
@@ -39,6 +39,8 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 0.265000 0.390000 1.440000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
     PORT
       LAYER pwell ;
@@ -51,6 +53,8 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 1.890000 0.390000 3.065000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
     END
   END VPB
   PIN VPWR
@@ -68,8 +72,6 @@
     LAYER mcon ;
       RECT 0.155000 -0.085000 0.325000 0.085000 ;
       RECT 0.155000  3.245000 0.325000 3.415000 ;
-    LAYER nwell ;
-      RECT -0.190000 1.655000 0.670000 3.520000 ;
   END
 END sky130_fd_sc_lp__tap_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
index 48b38ab..fd6d6e3 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
@@ -39,6 +39,8 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 0.265000 0.870000 1.440000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.805000 1.145000 ;
     END
     PORT
       LAYER pwell ;
@@ -51,6 +53,8 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 1.890000 0.870000 3.065000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.655000 1.150000 3.520000 ;
     END
   END VPB
   PIN VPWR
@@ -70,8 +74,6 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
-    LAYER nwell ;
-      RECT -0.190000 1.655000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_lp__tap_2
 END LIBRARY
diff --git a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
index 87dc49c..1b2fdbc 100644
--- a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
@@ -31,6 +31,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
   PIN VPB
@@ -39,6 +41,8 @@
     PORT
       LAYER met1 ;
         RECT 0.095000 2.660000 0.385000 2.890000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
     END
   END VPB
   PIN VPWR
diff --git a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
index 14ef8fb..dea7efc 100644
--- a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
@@ -31,6 +31,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
   PIN VPB
@@ -39,6 +41,8 @@
     PORT
       LAYER met1 ;
         RECT 0.095000 2.290000 0.385000 2.520000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
     END
   END VPB
   PIN VPWR
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
index e27327a..cc8b5a2 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
@@ -31,6 +31,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
   PIN VPWR
@@ -39,6 +41,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.655000 0.670000 3.520000 ;
     END
   END VPWR
   OBS