diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
index d6839f4..3bccbe9 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 y C1 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
index 11e5560..a08e952 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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.870000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.755000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.090000 1.685000 0.355000 2.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.v b/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
index 00cc9b2..b74e365 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211o_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
index 60305ca..a58645c 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 y C1 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
index 1fef04b..cab2fc2 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940000 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.605000 0.255000 0.835000 2.335000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.v b/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
index 7ce49ff..972f000 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211o_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl b/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
index 8d4e13d..966c791 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 y C1 pndB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
index e77f9ee..8c110b0 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.550000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 2.045000 0.255000 2.225000 0.615000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.v b/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
index cf28ea9..e1c06e4 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211o_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
index b8faa79..3a5ae13 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
index 3912baa..4ac5223 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.435000 0.815000 2.650000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
index ee92194..f554993 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
index 77e8349..6c4f61b 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
index eaec856..8914173 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 5.250000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.575000 0.855000 0.895000 2.115000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
index 11e1652..b807441 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
index 49a1bb7..9781c08 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
index 8369e41..b4b1154 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -82,18 +82,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -123,6 +111,22 @@
         RECT 7.905000 0.825000 8.160000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
index 8f9f4ab..b95d860 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a211oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
index d1154dc..12d61f8 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
index 3a0b5f8..4c04a00 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.683400 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 3.715000 0.265000 3.995000 2.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
index ce3f22e..3427e9d 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
index 2234263..2ffe048 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
index 660ad9e..0af192e 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.937200 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.645000 2.005000 0.900000 2.425000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
index 9b3754a..35b8cad 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
index 090f818..274f05a 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
index ca0b222..be70d89 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.050000 1.595000 2.580000 1.765000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
index e8e13ce..f486d0e 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
index 3b284be..69b3220 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 net40 A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 net40 A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPB0 Y B1 net40 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
index bfdcf8c..504eede 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.535500 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 1.440000 0.265000 1.780000 1.045000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
index 0716fdb..1b5724e 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
index 94de9cd..3b4a17f 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 net40 A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 net40 A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPB0 Y B1 net40 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
index 45a49cc..f1e4e3c 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.705500 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 2.980000 0.255000 3.360000 0.615000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
index bb8e67a..6ffe7f5 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
index 04fa386..4d9bf74 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 net40 A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net40 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 net40 A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 Y B1 net40 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
index 350e166..da5c71b 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.465000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.555000 0.675000 5.385000 0.695000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
index 137eb78..7243a35 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
index cbf50ca..2409811 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
index e9553e5..e3b982b 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.095000 0.265000 0.355000 2.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.v b/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
index fb48b5d..fe258c4 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21o_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
index fff7995..b01f8f7 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
index 2748463..16b68e9 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.935000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 0.545000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.v b/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
index 03fff8f..e575745 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21o_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
index 05d4e46..6bfa209 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
index f67b0c3..0a1e373 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 1.635000 1.755000 1.885000 2.185000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.v b/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
index 248abe0..7126fc9 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21o_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
index 5f18da1..7f6f376 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_6 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_6
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
index ff40b9f..d801acd 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 5.815000 1.615000 6.085000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.v b/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
index aeff63b..3f5dd81 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21o_6 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl b/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
index 6d432d3..299cf54 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21o_8 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21o_8
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
index 32eb4aa..2bb0598 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 6.755000 1.615000 7.025000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.v b/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
index a78f276..3ec8613 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21o_8 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
index db251fa..c1f136f 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
index 428ddcb..d0e1b36 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.315000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.660000 0.265000 0.885000 0.645000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
index 9c37f93..1cc8d19 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
index 9df9115..2549ebb 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
index 7d441d1..7c928d3 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.590000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 2.545000 0.255000 2.865000 0.615000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
index 0b352ad..0bbb7c8 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
index dc3a00b..463de33 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
index 78796f6..10b1c79 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.210000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.475000 0.675000 4.305000 0.695000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
index 11f89cc..95a4b7a 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a21oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
index 1b22147..1e53809 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 pndB B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
index 7bc3262..6a12082 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -126,6 +114,22 @@
         RECT 3.255000 0.825000 3.535000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
index b577243..ded1c30 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a221oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
index 8f8f734..37136c7 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 pndB B2 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
index 81d43df..8c70e3d 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -124,6 +112,22 @@
         RECT 4.415000 0.645000 4.795000 0.725000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
index 5eda31e..dbad1c7 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a221oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
index c384e5a..c20ea95 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 pndB B2 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
index e98c85b..90f444b 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -90,18 +90,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -133,6 +121,22 @@
         RECT 6.960000 0.645000 8.585000 0.735000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
index 2cc8059..8d11d27 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a221oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
index 15891dd..b8103b1 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 pndB B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 pndB B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPC0 Y C1 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI8 Y C2 pndB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net62 C2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 net62 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net62 C2 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a222oi_1
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
index 7b505d3..f3c7a1c 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -93,18 +93,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.350000 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 2.410000 0.295000 2.975000 0.645000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
index 618368d..68e62a2 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.v
@@ -86,30 +86,22 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a222oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    C2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1,
+    C2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  C2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
+    input  C2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
index ff4ef01..e214477 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
index ca00a64..5775445 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.600000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.365000 0.585000 3.535000 1.785000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.v b/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
index e273e46..ddbb561 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22o_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
index f8e74ae..23e1f49 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
index 350a41d..dd33c73 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.240000 0.585000 3.560000 1.785000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.v b/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
index 616e777..699277e 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22o_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl b/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
index 3dd20e9..3795706 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 y B2 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 sndB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
index 67109be..a04b14a 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.v b/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
index f98e076..a131b7b 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22o_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
index 60d5d7a..504bde9 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
index cc047d7..8f7c4f0 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 2.795000 0.825000 3.135000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
index 845aa5b..cfa7ffb 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
index c1cb505..acd1a5c 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
index 9c9997c..cfcad4b 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -93,18 +93,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -146,6 +134,22 @@
         RECT 1.930000 0.845000 2.360000 1.485000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.345000 0.680000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
index e977319..d6b398a 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
index d78ddf7..329cec8 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
index f3dc7aa..6db9ae7 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 3.425000 1.625000 3.675000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
index b1c6c59..0ad49a3 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a22oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
index 9844cd4..dc4def3 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inor VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inor pmid VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
index b33a3f3..5dd2f3f 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.467400 ;
     DIRECTION INOUT ;
@@ -138,6 +126,22 @@
         RECT 0.085000 0.255000 0.345000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.515000 0.995000 0.685000 1.805000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
index 36683b1..2f766bc 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
index a924037..9f3d4d2 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inor VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inor pmid VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
index d10a192..781c3ea 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -94,18 +94,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.849000 ;
     DIRECTION INOUT ;
@@ -144,6 +132,22 @@
         RECT 0.525000 1.525000 0.830000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.915000 0.995000 1.220000 1.325000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
index 20c3a66..b2d156d 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
index 4e9f000..b7d6e48 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inor VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inor pmid VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
index a772bb5..39d0f15 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 7.310000 0.905000 7.675000 1.415000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
index 566082a..a767f28 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
index 3e236c4..63c12fd 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 Y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor pmid VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
index 6a9c948..f3797db 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
@@ -140,6 +128,22 @@
         RECT 1.985000 0.825000 2.155000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.645000 0.255000 0.815000 0.660000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
index 8e6e061..32bcfa3 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
index 8f58a69..7d4982c 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 Y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor pmid VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
index 431a5bc..f1efbba 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.325000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.445000 0.905000 2.775000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.325000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
index 46a1671..90fde46 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
index 7c5cd3d..585ddfc 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
+MMNaoi10 VGND B1 sndNB1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 Y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNaoi20 Y inor VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N sndPA1N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor pmid VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
index 306b7a2..55844ee 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 5.245000 1.615000 5.515000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
index 9e7cc5d..d5fee78 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.v
@@ -85,11 +85,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -97,10 +93,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
index 144e992..84bb0f5 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
index ce97491..7d94d75 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.705000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 0.095000 1.575000 0.425000 2.425000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.v b/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
index c506b61..141eaea 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31o_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
index 140b0b4..1cf5b7e 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
index 7196fde..f99f623 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.910000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.645000 2.005000 0.815000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.v b/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
index d7d3a81..dff8855 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31o_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl b/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
index 9080bbd..ff17663 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
index 47fb98c..571702e 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 6.585000 0.825000 6.780000 1.785000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.v b/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
index c7c2dd2..2962ff1 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31o_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
index 88adb6c..96e6cad 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
index 6996b46..89e04ca 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.595000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 1.985000 1.495000 2.410000 2.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
index ca3f01a..8b9c094 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
index cb05f2c..0874318 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
index 0e1e564..70630df 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.575000 0.295000 4.955000 0.655000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
index 55a8205..c52847d 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
index 5a46200..978ab50 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
index b7bb292..52543c5 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 8.265000 0.255000 8.435000 0.635000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
index 74e4943..bc4c3e7 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a31oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
index ba612aa..4e4a22b 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
index 1d759db..d61fcc9 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.975000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 0.090000 1.915000 0.425000 2.425000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.v b/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
index a72672e..8752657 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32o_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
index ad76bbd..96e6ccd 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
index 10f68bb..7d4bde1 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 1.115000 1.955000 1.285000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.v b/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
index bd37980..15e8042 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32o_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl b/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
index b0ffee9..e70490d 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 net73 B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 net73 B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 net73 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 net73 B2 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X net73 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIPX X net73 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 net73 A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 net73 A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 net73 B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNB0 net73 B1 sndB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X net73 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X net73 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
index d649fff..35ade2e 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
@@ -121,6 +109,22 @@
         RECT 1.585000 1.665000 1.755000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.v b/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
index 23776ca..4284897 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32o_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
index 9566869..48afa4d 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
index 654c789..0be3ff7 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 0.965000 0.295000 1.265000 0.635000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.235000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
index 75f41a5..9d401cb 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32oi_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
index 721c3e6..80493e7 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
index 9934dab..0a6f6c9 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.195000 1.305000 6.630000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.080000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 1.965000 0.825000 2.195000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.195000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
index 6c54161..ddf9941 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32oi_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
index 24900cb..48f76a2 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 pndA A1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 pndA A2 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA2 pndA A3 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB0 Y B1 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMPB1 Y B2 pndA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 Y A1 sndA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 sndA2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 sndB1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
index 69ef3da..9b12761 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -120,18 +120,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.195000 ;
     DIRECTION INOUT ;
@@ -192,6 +180,22 @@
         RECT 3.335000 1.745000 3.715000 2.085000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 2.255000  4.105000 2.425000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
index 020f66f..899b5df 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.v
@@ -84,28 +84,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__a32oi_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.cdl b/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
index 9ec5958..6bc3c70 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_1
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
index 659d345..99f4562 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.445650 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.860000 0.545000 2.155000 1.915000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.v b/cells/and2/sky130_fd_sc_hdll__and2_1.v
index 8a69287..068a992 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2_1 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.cdl b/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
index a61292b..471384a 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_2
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
index 1720d99..03f6774 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.819100 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.935000 0.545000 2.205000 1.915000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.v b/cells/and2/sky130_fd_sc_hdll__and2_2.v
index 718121b..f4f1b06 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2_2 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.cdl b/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
index 8bcfadb..6a8b795 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_4
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
index c33ead0..65ac092 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.245000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 3.290000 0.845000 3.570000 1.535000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.v b/cells/and2/sky130_fd_sc_hdll__and2_4.v
index e421327..307a433 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2_4 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.cdl b/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
index 0d2650d..821e637 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_6 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_6
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
index 1b28be1..09d34f1 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 4.475000 0.885000 4.975000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.v b/cells/and2/sky130_fd_sc_hdll__and2_6.v
index 5a94bf5..7ea3004 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2_6 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.cdl b/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
index faf37d6..d66a30d 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2_8 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2_8
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
index d086e55..9a5e931 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.010000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 5.495000 0.885000 5.915000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.v b/cells/and2/sky130_fd_sc_hdll__and2_8.v
index 053ad70..ef1fda3 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.v
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2_8 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
index 763a481..93a3dce 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_1 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
index bb135e4..51db0ed 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.642200 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.770000 0.775000 3.080000 1.580000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.v b/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
index 5fe3585..2d30d52 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2b_1 (
-    X   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
index fce0815..a529289 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_2 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
index 3a95734..8a6fa42 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.924800 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.755000 0.775000 3.090000 1.580000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.v b/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
index c7ca558..11f16a7 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2b_2 (
-    X   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl b/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
index d4edef3..701d0a1 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and2b_4 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
index 476a2a7..6886ec8 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.275700 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.445000 0.825000 2.980000 1.535000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.v b/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
index a3e671e..f9fd713 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and2b_4 (
-    X   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.cdl b/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
index 10ab44b..89ad40b 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_1
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
index 2e8dbbf..e87ac0a 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.454800 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 2.490000 0.735000 2.660000 1.765000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.v b/cells/and3/sky130_fd_sc_hdll__and3_1.v
index da630b0..469fcbf 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.cdl b/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
index 660322c..088c7dd 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_2
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
index 825c24d..737a7fd 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.832500 ;
     DIRECTION INOUT ;
@@ -132,6 +120,22 @@
         RECT 2.260000 1.445000 2.620000 1.795000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.100000 1.425000 2.040000 1.595000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.v b/cells/and3/sky130_fd_sc_hdll__and3_2.v
index 703fc57..db6ca8a 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.cdl b/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
index 7fe47e7..5f22724 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3_4
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
index 385b9f5..446cb35 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.435000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 4.210000 0.845000 4.490000 1.535000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.v b/cells/and3/sky130_fd_sc_hdll__and3_4.v
index fd11871..fdcfa7b 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.v
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
index f85c4f4..7bfefa2 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_1 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
index a6bbf44..1c11ff4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.591300 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 3.365000 0.735000 3.535000 1.765000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.v b/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
index e46648a..0b8a4e9 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3b_1 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
index 54fa980..04abbf8 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_2 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
index 1ddea58..93952a4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940900 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 3.240000 1.445000 3.590000 1.795000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.v b/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
index 5256f89..0b692da 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3b_2 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl b/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
index d9d38b2..1ed57f3 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and3b_4 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
index 682d0a9..cd558e5 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.390700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 3.570000 0.845000 3.995000 1.535000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.v b/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
index 4b7d915..3262ef5 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and3b_4 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.cdl b/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
index 2e703e6..a0c4db6 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_1
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
index 45726f4..421ef8f 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560100 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.825000 0.805000 3.085000 2.205000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.v b/cells/and4/sky130_fd_sc_hdll__and4_1.v
index ba91da3..cb242ea 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.cdl b/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
index 18b0d89..b6fce8e 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_2
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
index 41f5ee5..c298a84 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.994300 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.835000 0.805000 3.075000 1.835000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.v b/cells/and4/sky130_fd_sc_hdll__and4_2.v
index 89d1524..d8b5cd1 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.cdl b/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
index 6055015..4435e79 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4_4
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
index 00ee00e..9c14b6a 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.510000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.200000 0.810000 4.455000 1.485000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.v b/cells/and4/sky130_fd_sc_hdll__and4_4.v
index 28d0a3a..60ffe2b 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.v
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
index 907c446..3d7f246 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_1 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
index 4527482..848e24b 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.711500 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.725000 0.805000 3.995000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.v b/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
index 374e61a..3fae391 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4b_1 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
index 72de73b..9852b49 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_2 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
index 831d6ce..dbd7c9c 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.856300 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.775000 0.825000 4.455000 1.535000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.v b/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
index dd0605e..8076710 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4b_2 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl b/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
index b64963a..d3e12aa 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4b_4 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
index 8f02245..90b01e6 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.615700 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.v b/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
index 9ed45d8..8bb5b28 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4b_4 (
-    X   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
index c47a221..6f7506b 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
index 7871b48..2ed3f5a 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.677900 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 4.285000 0.825000 4.510000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
index e47bbb7..cabcaf2 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4bb_1 (
-    X   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
index 09fd873..df0a3cc 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
index 117aa5c..66300f8 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.299000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 1.065000 1.545000 1.420000 1.715000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
index dc57a05..d6be304 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4bb_2 (
-    X   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
index 8a9eafd..21fea2a 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
index 3a226d6..7893514 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.981400 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
index 1c359b1..fa6ba73 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__and4bb_4 (
-    X   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output X   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.cdl b/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
index d3627e6..1f31d63 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MMIN2 X Ab VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_1
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
index 09707be..088df0c 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.244900 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.215000 0.760000 1.395000 1.560000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.165000 1.535000 0.890000 1.705000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.v b/cells/buf/sky130_fd_sc_hdll__buf_1.v
index 1a3db55..365f740 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_1 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.cdl b/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
index 10c371e..a75d7ae 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_12 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_12
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
index 7b30821..228507d 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.620000 -0.085000 0.790000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
@@ -156,6 +144,22 @@
         RECT 7.225000 1.615000 7.395000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.620000 -0.085000 0.790000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.515000 1.445000 2.215000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.v b/cells/buf/sky130_fd_sc_hdll__buf_12.v
index 016e4ff..78e58b8 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_12 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.cdl b/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
index 773224b..ac7a96a 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_16
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
index 4165bf0..9f9c7be 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.440000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 10.860000 1.615000 11.135000 2.360000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.v b/cells/buf/sky130_fd_sc_hdll__buf_16.v
index 515bd9e..169b7f9 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_16 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.cdl b/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
index 6a80e8a..1c0982b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_2
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
index 54dffee..c40c7a7 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.709400 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.270000 0.255000 1.695000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.v b/cells/buf/sky130_fd_sc_hdll__buf_2.v
index f60b9e3..6a32a7b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_2 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.cdl b/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
index 2eafd4e..19cc186 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_4
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
index 68c5a7b..c35ab09 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 2.055000 1.615000 2.225000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.095000 1.485000 0.860000 1.655000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.v b/cells/buf/sky130_fd_sc_hdll__buf_4.v
index 4c472d7..77f8a5a 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_4 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.cdl b/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
index d64dd78..6ceea61 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_6 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_6
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
index d12b2aa..8d3ee15 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -126,6 +114,22 @@
         RECT 3.725000 1.615000 3.895000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.775000 0.255000 1.155000 0.735000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.v b/cells/buf/sky130_fd_sc_hdll__buf_6.v
index 6b4f833..c7f879b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_6 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.cdl b/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
index f65ea5d..c53eb76 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__buf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__buf_8
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
index d28b2df..ae4bf23 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
@@ -136,6 +124,22 @@
         RECT 4.875000 1.615000 5.045000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.745000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.v b/cells/buf/sky130_fd_sc_hdll__buf_8.v
index d38665f..7f19ba5 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.v
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__buf_8 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
index 2a70963..b048edc 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 Abb Ab VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN3 Abbb Abb VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Abbb Abb VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN4 X Abbb VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X Abbb VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Abbb Abb VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
index fcd77a7..8478736 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  4.020000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 12.920000 0.905000 13.220000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
index 41e1667..3cae647 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__bufbuf_16 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
index e351e20..f7b9ece 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X Abbb VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X Abbb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 Abb Ab VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN3 Abbb Abb VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN4 X Abbb VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Abbb Abb VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP4 X Abbb VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Abbb Abb VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufbuf_8
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
index f8a298d..7348820 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.044400 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 6.860000 0.905000 7.240000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
index 9ca2f16..d896184 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__bufbuf_8 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
index 627b284..b9e9a38 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 Y Abb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 Abb Ab VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Y Abb VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 Y Abb VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
index 3de14d1..6e2fdb4 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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.610000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.750000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 11.930000 0.905000 12.205000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
index 3658092..4f34f00 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__bufinv_16 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
index 7f831c2..f63203b 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__bufinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Y Abb VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 Y Abb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 Abb Ab VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 Y Abb VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Abb Ab VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 Y Abb VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__bufinv_8
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
index 47c654e..70c3057 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 6.415000 0.905000 6.805000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
index e368e19..945a966 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__bufinv_8 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
index fe1c8e6..9c89448 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MMIN0 Ab A VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MMIN1 X Ab VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
index fa3e892..31ac081 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -48,12 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.529300 ;
     DIRECTION INOUT ;
@@ -74,6 +68,14 @@
         RECT 0.085000 1.560000 0.355000 2.465000 ;
     END
   END X
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
index f78339b..5526231 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_1 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
index 88394fb..823f282 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_12 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN0 Ab A VGND VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_12
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
index 5ac5bbd..3ec4d4a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
@@ -92,6 +80,22 @@
         RECT 7.175000 1.665000 7.445000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
index 375aec4..cf39110 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_12 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
index 5527788..97bd392 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN0 Ab A VGND VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
index 3b13052..11ccd41 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.245000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 9.245000 1.720000  9.535000 2.460000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
index 3352bfb..585ad82 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_16 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
index 26449c3..3674d7c 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
index e962f0d..0531c3c 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.615000 ;
     DIRECTION INOUT ;
@@ -82,6 +70,22 @@
         RECT 1.485000 0.825000 1.875000 1.855000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
index a80e84a..13d5e96 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_2 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
index d5ad0d4..dc99165 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
index 8e0bb1b..561de62 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.960000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 2.410000 0.905000 2.910000 1.415000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
index 154ab46..422524b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_4 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
index c6f23fb..6e89102 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_6 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=6 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Ab A VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=6 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_6
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
index f98968c..76738c4 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 3.745000 0.905000 4.075000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
index 49b732d..c7b7b31 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_6 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
index d5e44f9..29510ef 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Ab A VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X Ab VGND VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Ab A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X Ab VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
index ec164e6..98a5a0a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.750000 ;
     DIRECTION INOUT ;
@@ -88,6 +76,22 @@
         RECT 4.450000 1.735000 4.710000 2.460000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
index 999db5b..18c3e29 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkbuf_8 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
index f6a892d..4cf2d70 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pfet_01v8_hvt m=2 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
index 877418c..ef1f37d 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.470400 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.515000 1.290000 0.895000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
index e897022..171348f 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_1 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
index 1c01b46..b4d8b8a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_12 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pfet_01v8_hvt m=18 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=18 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=12 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_12
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
index e4f458a..aa04bee 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.860000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 8.115000 1.630000 8.385000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
index 22856c7..6618a8a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_12 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
index 51c48af..cf468a4 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pfet_01v8_hvt m=24 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=24 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
index c99440e..8abe5da 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.895000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 11.375000 1.665000 11.630000 2.450000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
index 5777d2b..c0230af 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_16 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
index 934838b..50fa1e9 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
index e93643a..a6ef5e2 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.575000 ;
     DIRECTION INOUT ;
@@ -83,6 +71,22 @@
         RECT 1.520000 0.895000 2.155000 1.460000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
index 5237195..c6d9226 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_2 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
index 0bb90cf..b0337ec 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
index e758998..b02c1f0 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.270000 ;
     DIRECTION INOUT ;
@@ -86,6 +74,22 @@
         RECT 3.270000 0.895000 3.570000 1.460000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
index aaf9802..efb98ae 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_4 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
index 3df1388..7cc67d0 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VGND VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
index a9ca538..796c00e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.095000 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 6.060000 0.865000 6.330000 1.460000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
index db8c79e..7035fb7 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinv_8 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
index ebf0cd5..12eae7f 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinvlp_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net24 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net24 A VGND VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A net24 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinvlp_2
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
index 5c13234..638ca54 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.650000 ;
     DIRECTION INOUT ;
@@ -79,6 +67,22 @@
         RECT 0.785000 0.750000 1.235000 2.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
index 57ca147..235355b 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinvlp_2 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
index aa39cca..6e29667 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.cdl
@@ -16,14 +16,14 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkinvlp_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net35 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net31 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A net31 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net35 A VGND VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net31 A VGND VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Y A net35 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkinvlp_4
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
index b7b8b3a..f7ffe43 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.790000 ;
     DIRECTION INOUT ;
@@ -82,6 +70,22 @@
         RECT 1.655000 1.295000 1.985000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
index 3106c57..9c8fb5e 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkinvlp_4 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
index f536ad1..bfd40a0 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_1 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_1
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
index 6c1589b..c9d10e6 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.420000 -0.085000 0.640000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.805800 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
index 00f1b27..654817e 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkmux2_1 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
index 3867500..2a6a71d 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=2 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=2 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_2
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
index 1fdda11..b5b0e84 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.880000 -0.085000 1.100000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.066400 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 0.555000 1.495000 0.895000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.880000 -0.085000 1.100000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
index 1220f4b..c67ee1d 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkmux2_2 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
index 078933d..75bd1d7 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__clkmux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=4 w=1 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=0.94 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=4 w=1 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__clkmux2_4
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
index 5998e4d..6c7f193 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 1.800000 -0.085000 2.020000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.358800 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 1.475000 1.495000 1.835000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 1.800000 -0.085000 2.020000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
index 830a23b..2952c09 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__clkmux2_4 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
index 8286dca..87d9e8f 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -54,18 +54,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -74,6 +62,22 @@
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.v b/cells/conb/sky130_fd_sc_hdll__conb_1.v
index 160dbfd..7d98832 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.v
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__conb_1 (
-    HI  ,
-    LO  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    HI,
+    LO
 );
 
-    output HI  ;
-    output LO  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output HI;
+    output LO;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.cdl b/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
index d52eec4..ae0a9e8 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_12 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=4.73 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=4.73 mult=1 sa=0.265
+MI1 VGND VPWR VGND VNB nfet_01v8 m=1 w=0.55 l=4.73 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPWR VPB pfet_01v8_hvt m=1 w=0.87 l=4.73 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_12
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
index d27a9d7..9e425f0 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  2.601500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.v b/cells/decap/sky130_fd_sc_hdll__decap_12.v
index 3dfa660..1fe3c33 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__decap_12 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__decap_12 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.cdl b/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
index c3ac3ab..6510c91 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_3 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=0.59 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=0.59 mult=1 sa=0.265
+MI1 VGND VPWR VGND VNB nfet_01v8 m=1 w=0.55 l=0.59 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPWR VPB pfet_01v8_hvt m=1 w=0.87 l=0.59 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_3
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
index b902698..812c723 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.324500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.v b/cells/decap/sky130_fd_sc_hdll__decap_3.v
index 549027c..2292136 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__decap_3 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__decap_3 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.cdl b/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
index e86c193..eb04c79 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=1.05 mult=1 sa=0.265
+MI2 VPWR VGND VPWR VPB pfet_01v8_hvt m=1 w=0.87 l=1.05 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=1.05 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VGND VNB nfet_01v8 m=1 w=0.55 l=1.05 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_4
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
index 40ed3ef..ce9e325 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.577500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.v b/cells/decap/sky130_fd_sc_hdll__decap_4.v
index a1d7dc7..8b30354 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__decap_4 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__decap_4 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.cdl b/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
index 56472c3..64b30ce 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_6 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=1.97 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=1.97 mult=1 sa=0.265
+MI1 VGND VPWR VGND VNB nfet_01v8 m=1 w=0.55 l=1.97 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPWR VPB pfet_01v8_hvt m=1 w=0.87 l=1.97 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_6
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
index e82dafa..e217538 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.083500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.v b/cells/decap/sky130_fd_sc_hdll__decap_6.v
index 7d63d36..c76ae7e 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__decap_6 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__decap_6 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.cdl b/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
index 30ffbe6..48d9b5d 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__decap_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=2.89 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pfet_01v8_hvt m=1 w=0.87 l=2.89 mult=1 sa=0.265
+MI1 VGND VPWR VGND VNB nfet_01v8 m=1 w=0.55 l=2.89 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPWR VPB pfet_01v8_hvt m=1 w=0.87 l=2.89 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__decap_8
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
index 4a40cdd..085cb29 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -40,18 +40,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.589500 ;
@@ -62,6 +50,22 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.v b/cells/decap/sky130_fd_sc_hdll__decap_8.v
index f8fe0b7..9bfa7e9 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.v
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__decap_8 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__decap_8 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
index 6335e56..8e12263 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net82 s0 net108 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net108 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net82 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos net93 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos s0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos net165 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net144 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
index 5767883..13700c6 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.314500 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
index cad33b7..1f4f84a 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.v
@@ -78,21 +78,13 @@
     Q      ,
     CLK    ,
     D      ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
     input  CLK    ;
     input  D      ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
index dee470b..337663f 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net82 s0 net108 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net108 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net82 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos net93 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos s0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos net165 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net144 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
index f6dad56..17874d3 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.584500 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
index fa23db7..00b82e8 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.v
@@ -78,21 +78,13 @@
     Q      ,
     CLK    ,
     D      ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
     input  CLK    ;
     input  D      ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
index ddf95c6..073d018 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net82 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net101 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net93 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net82 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net81 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net165 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net82 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net82 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net82 s0 net108 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net144 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net108 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net82 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net101 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos net93 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI34 net93 M1 net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI655 s0 clkneg net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net82 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net81 net82 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos s0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net165 net82 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net82 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos net165 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net82 s0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net144 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net144 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net144 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net82 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfrtp_4
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
index d004118..2ae1a1a 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -86,18 +86,6 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  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.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.881700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
index e563d96..2a8e0f2 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.v
@@ -78,21 +78,13 @@
     Q      ,
     CLK    ,
     D      ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
     input  CLK    ;
     input  D      ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
index d66746b..52d57b7 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net100 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 M1 M0 net103 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net100 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 S0 clkpos net120 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI26 S0 clkneg net80 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI27 net80 S1 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI655 M0 clkpos net100 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 net103 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net128 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net179 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net156 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI5 S0 clkpos net143 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI663 net128 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
index fb5a2fc..49d2514 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.388300 ;
     DIRECTION INOUT ;
@@ -169,6 +157,22 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000 0.345000 0.635000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
index c789767..b7f3cb6 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.v
@@ -78,21 +78,13 @@
     Q    ,
     CLK  ,
     D    ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
     input  CLK  ;
     input  D    ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
index 2122a7c..63e1720 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net100 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 M1 M0 net103 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net100 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 S0 clkpos net120 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI26 S0 clkneg net80 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI27 net80 S1 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI655 M0 clkpos net100 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 net103 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net128 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net179 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net156 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI5 S0 clkpos net143 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI663 net128 S0 VPWR VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=1 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI660 Q net128 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
index edd260a..e03c191 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -118,18 +118,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.678900 ;
     DIRECTION INOUT ;
@@ -175,6 +163,22 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000 0.345000 0.635000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
index 79b4ff6..e8141c1 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.v
@@ -78,21 +78,13 @@
     Q    ,
     CLK  ,
     D    ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
     input  CLK  ;
     input  D    ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
index 38cf25a..65acbf9 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net100 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI39 db D VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 M1 M0 net103 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net100 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 S0 clkpos net120 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI26 S0 clkneg net80 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI27 net80 S1 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.54 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 VNB nfet_01v8 m=5 w=0.65 l=0.15 mult=1 sa=0.265
+MI655 M0 clkpos net100 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 net103 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 Q net128 VGND VNB nfet_01v8 m=5 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI40 db D VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net179 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net156 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI5 S0 clkpos net143 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB pfet_01v8_hvt m=5 w=1.0 l=0.18 mult=1 sa=0.265
+MI663 net128 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPWR VPB pfet_01v8_hvt m=5 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dfstp_4
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
index f2738d7..2a2f233 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -126,18 +126,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.968300 ;
     DIRECTION INOUT ;
@@ -187,6 +175,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.175000 0.345000  0.345000 0.635000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
index f25e3ee..78259a5 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.v
@@ -78,21 +78,13 @@
     Q    ,
     CLK  ,
     D    ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
     input  CLK  ;
     input  D    ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
index 98d44c4..a9c7712 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
@@ -40,26 +40,32 @@
         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 INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.v b/cells/diode/sky130_fd_sc_hdll__diode_2.v
index 0b7298b..8a04df0 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.v
@@ -66,18 +66,10 @@
 
 `celldefine
 module sky130_fd_sc_hdll__diode_2 (
-    DIODE,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    DIODE
 );
 
     input DIODE;
-    input VPWR ;
-    input VGND ;
-    input VPB  ;
-    input VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
index bad0693..b2deafa 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
@@ -40,26 +40,32 @@
         RECT 0.085000 0.255000 1.755000 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 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.v b/cells/diode/sky130_fd_sc_hdll__diode_4.v
index d9df9e0..cc45c7c 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.v
@@ -66,18 +66,10 @@
 
 `celldefine
 module sky130_fd_sc_hdll__diode_4 (
-    DIODE,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    DIODE
 );
 
     input DIODE;
-    input VPWR ;
-    input VGND ;
-    input VPB  ;
-    input VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
index 500ed29..932c87e 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
@@ -40,13 +40,25 @@
         RECT 0.085000 0.255000 2.675000 2.465000 ;
     END
   END DIODE
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
   PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
     PORT
       LAYER pwell ;
         RECT 0.145000 -0.085000 0.315000 0.085000 ;
     END
   END VNB
   PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER nwell ;
         RECT -0.190000 1.305000 0.650000 2.070000 ;
@@ -54,14 +66,8 @@
         RECT  2.110000 1.305000 2.950000 2.070000 ;
     END
   END VPB
-  PIN VGND
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.v b/cells/diode/sky130_fd_sc_hdll__diode_6.v
index 37aa616..82c0c5b 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.v
@@ -66,18 +66,10 @@
 
 `celldefine
 module sky130_fd_sc_hdll__diode_6 (
-    DIODE,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    DIODE
 );
 
     input DIODE;
-    input VPWR ;
-    input VGND ;
-    input VPB  ;
-    input VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
index 9e0a91e..f5b6d5e 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
@@ -40,13 +40,25 @@
         RECT 0.085000 0.255000 3.595000 2.465000 ;
     END
   END DIODE
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
   PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
     PORT
       LAYER pwell ;
         RECT 0.145000 -0.085000 0.315000 0.085000 ;
     END
   END VNB
   PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER nwell ;
         RECT -0.190000 1.305000 0.650000 2.070000 ;
@@ -54,14 +66,8 @@
         RECT  3.030000 1.305000 3.870000 2.070000 ;
     END
   END VPB
-  PIN VGND
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.v b/cells/diode/sky130_fd_sc_hdll__diode_8.v
index 2145a94..c323922 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.v
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.v
@@ -66,18 +66,10 @@
 
 `celldefine
 module sky130_fd_sc_hdll__diode_8 (
-    DIODE,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    DIODE
 );
 
     input DIODE;
-    input VPWR ;
-    input VGND ;
-    input VPB  ;
-    input VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
index e9313c0..f6dd46f 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
index 9b5afcc..7425f6e 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
index 2163572..6a755ce 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.v
@@ -78,21 +78,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE_N ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE_N
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE_N ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
index 9e6001d..4fb942a 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
index 5948846..4faa579 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
index f349c5a..ddf814b 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.v
@@ -78,21 +78,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE_N ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE_N
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE_N ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
index 0e75fe2..100f9ea 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
index 0bdbfed..0da04d7 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
index f6e3463..056dc63 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.v
@@ -78,21 +78,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE_N ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE_N
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE_N ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
index 2af7aa1..d3476e8 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI634 clkneg GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI649 Q m1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
index ec0a532..f680843 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
index 860b7d8..3b9194d 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.v
@@ -79,21 +79,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE   ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE   ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
index b2ef195..5e3d389 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI634 clkneg GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI649 Q m1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
index 5a34032..d064965 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
index 7125d90..ea82caf 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.v
@@ -79,21 +79,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE   ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE   ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
index 47f735d..9f3feb2 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI17 M0 clkneg net54 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI633 clkneg GATE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 m1 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net54 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI653 net50 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net50 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI634 clkneg GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI649 Q m1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI657 net93 RESET_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg net101 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net101 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 net93 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net93 RESET_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net81 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net81 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net81 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
index d710b8f..2c6c5ea 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
index a91043b..21bf118 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.v
@@ -79,21 +79,13 @@
     Q      ,
     RESET_B,
     D      ,
-    GATE   ,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    GATE
 );
 
     output Q      ;
     input  RESET_B;
     input  D      ;
     input  GATE   ;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
index 2e44ad4..09ae8bc 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net53 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net53 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net44 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net53 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net44 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net44 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 M0 clkneg net96 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI654 net96 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net96 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net76 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net76 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net76 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
index 04a7dc4..95898aa 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.784600 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
index 8f13e00..69a59c2 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__dlxtn_1 (
     Q     ,
     D     ,
-    GATE_N,
-    VPWR  ,
-    VGND  ,
-    VPB   ,
-    VNB
+    GATE_N
 );
 
     output Q     ;
     input  D     ;
     input  GATE_N;
-    input  VPWR  ;
-    input  VGND  ;
-    input  VPB   ;
-    input  VNB   ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
index 0756c5b..ad774d8 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net51 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net51 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net47 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net47 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 M0 clkneg net94 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI654 net94 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net74 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net74 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
index 6a8d75c..f8785e8 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.044600 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
index 80c00ef..dd3825a 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__dlxtn_2 (
     Q     ,
     D     ,
-    GATE_N,
-    VPWR  ,
-    VGND  ,
-    VPB   ,
-    VNB
+    GATE_N
 );
 
     output Q     ;
     input  D     ;
     input  GATE_N;
-    input  VPWR  ;
-    input  VGND  ;
-    input  VPB   ;
-    input  VNB   ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
index 52ea1bc..89add44 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos GATE_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI17 M0 clkneg net51 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net51 db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI650 Q m1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI633 clkpos GATE_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net51 db VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI653 net47 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos net47 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI638 db D VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 clkpos GATE_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 M0 clkneg net94 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI654 net94 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI19 M0 clkpos net74 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net74 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlxtn_4
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
index 44dc6a2..86e2d8a 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.349600 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
index a649151..8644a9f 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__dlxtn_4 (
     Q     ,
     D     ,
-    GATE_N,
-    VPWR  ,
-    VGND  ,
-    VPB   ,
-    VNB
+    GATE_N
 );
 
     output Q     ;
     input  D     ;
     input  GATE_N;
-    input  VPWR  ;
-    input  VGND  ;
-    input  VPB   ;
-    input  VNB   ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
index a7b92f9..acff3c0 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd1_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN1 Ab net34 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X Ab VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI6 net34 net30 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI9 net30 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 Ab net34 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd1_1
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
index 9d1b935..5ba95d3 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 2.950000 0.825000 3.120000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
index b70be0c..a26f834 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__dlygate4sd1_1 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
index 74a48da..76b2af8 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd2_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIN1 Ab net34 VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIN2 X Ab VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI6 net34 net30 VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI9 net30 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 Ab net34 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd2_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
index 7cad248..681a101 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 2.860000 0.825000 3.110000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
index 85d630d..de973ce 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__dlygate4sd2_1 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
index 24722bb..2beda5a 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__dlygate4sd3_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
+MMIN1 Ab net34 VGND VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
+MMIN2 X Ab VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
+MI6 net34 net30 VGND VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI9 net30 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__dlygate4sd3_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
index 2ede95d..87c2176 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.449100 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 3.325000 0.825000 3.595000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
index af923a0..577691b 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__dlygate4sd3_1 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
index 7454941..99f14d5 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMN0 Z net35 sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 net39 TE_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI6 net35 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 Z VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIP1 net39 TE_B VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
index e19b63e..bdd6555 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.465600 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 3.315000 0.825000 3.585000 1.495000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT -0.005000  2.635000 3.680000 2.805000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
index 1e33c21..bba2b57 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__ebufn_1 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
index 642fa35..516fafa 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMN0 Z net35 sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 net39 TE_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI6 net35 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 Z VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIP1 net39 TE_B VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
index 01c58e2..c6a8e90 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.525400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 4.230000 0.855000 4.460000 1.445000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
index c354824..8caac5d 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__ebufn_2 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
index 6c89241..7676a9f 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMN0 Z net35 sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 net39 TE_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI6 net35 A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 Z VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 net39 TE_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
index 5b4ee2a..a87875a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.940200 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 6.105000 0.855000 6.335000 1.445000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
index 3b5955c..97e39b1 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__ebufn_4 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
index d827747..658ea1d 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__ebufn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net39 VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
+MMN0 Z net35 sndA VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
+MMIN1 net39 TE_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net35 VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MI6 net35 A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 Z VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 net39 TE_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
index f9ab309..322e190 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -59,18 +59,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.958400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 10.675000 0.855000 10.925000 1.445000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
index a2e56ae..2fff26d 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__ebufn_8 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
index 5ceafde..eee02ba 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net25 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMN1 sndA net25 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net25 TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN1 net25 TE_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net25 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net25 TE_B VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
index 263427f..f4bd440 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.314400 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.970000 0.595000 2.210000 1.785000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.v b/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
index 4533d6c..1956eba 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__einvn_1 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
index a22a85f..f175512 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TE TE_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
index bea1a18..340621f 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.552600 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 3.035000 1.695000 3.535000 2.465000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.v b/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
index 42b9e09..2881a40 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__einvn_2 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
index 663a059..dcc423d 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TE TE_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
index d6c1a9c..d1f0e43 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.866300 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 4.430000 1.480000 4.810000 2.075000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.v b/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
index 8313649..c7cfb37 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__einvn_4 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl b/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
index c10897d..6ac4a83 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TE TE_B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TE_B sndTEB VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
index 23610f3..8718617 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.411500 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 8.870000 0.825000 9.095000 1.455000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.v b/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
index 790a28a..1042874 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.v
@@ -74,20 +74,12 @@
 module sky130_fd_sc_hdll__einvn_8 (
     Z   ,
     A   ,
-    TE_B,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    TE_B
 );
 
     output Z   ;
     input  A   ;
     input  TE_B;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
index cfc71d0..7bce8ee 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_1 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TEB TE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TEB sndTEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
index 39fe8f5..435e597 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.845700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.980000 2.125000 2.625000 2.465000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.v b/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
index c2555ff..e1e5cdc 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__einvp_1 (
-    Z   ,
-    A   ,
-    TE  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z ,
+    A ,
+    TE
 );
 
-    output Z   ;
-    input  A   ;
-    input  TE  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Z ;
+    input  A ;
+    input  TE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
index a842f15..1a6951d 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_2 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TEB TE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TEB sndTEB VPB pfet_01v8_hvt m=2 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
index f7d7ee4..be4a721 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.445400 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.645000 0.595000 3.075000 2.125000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.v b/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
index c707a7d..fd0fabb 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__einvp_2 (
-    Z   ,
-    A   ,
-    TE  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z ,
+    A ,
+    TE
 );
 
-    output Z   ;
-    input  A   ;
-    input  TE  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Z ;
+    input  A ;
+    input  TE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
index cc91aa9..61793f1 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_4 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TEB TE VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TEB sndTEB VPB pfet_01v8_hvt m=4 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
index dae946e..cdfd600 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.815200 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 4.430000 1.615000 4.810000 2.125000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.v b/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
index b82e7aa..c46ef17 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__einvp_4 (
-    Z   ,
-    A   ,
-    TE  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z ,
+    A ,
+    TE
 );
 
-    output Z   ;
-    input  A   ;
-    input  TE  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Z ;
+    input  A ;
+    input  TE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl b/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
index 3d3653b..243b345 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__einvp_8 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A sndA VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TEB VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1 sa=0.265
+MMN1 sndA TE VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 TEB TE VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR TEB sndTEB VPB pfet_01v8_hvt m=8 w=0.94 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A Z VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
index d96c80d..d5c92fb 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.360400 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 8.190000 1.615000 8.570000 2.125000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.v b/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
index 3afde24..e51e501 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__einvp_8 (
-    Z   ,
-    A   ,
-    TE  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z ,
+    A ,
+    TE
 );
 
-    output Z   ;
-    input  A   ;
-    input  TE  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Z ;
+    input  A ;
+    input  TE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
index c84257b..47f8a86 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.055000 0.260000 0.055000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.460000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.v b/cells/fill/sky130_fd_sc_hdll__fill_1.v
index 8bbeed3..9c059e3 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__fill_1 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__fill_1 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
index 3c09c4a..e12ca44 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 0.920000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.050000 0.315000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.920000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.v b/cells/fill/sky130_fd_sc_hdll__fill_2.v
index 7444cee..d46b9f5 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__fill_2 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__fill_2 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
index 3f77c1b..b42d8f2 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.175000 -0.060000 0.285000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.v b/cells/fill/sky130_fd_sc_hdll__fill_4.v
index 7806822..710995b 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__fill_4 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__fill_4 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
index 1d8bd82..2b1c602 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -38,18 +38,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -58,6 +46,22 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.120000 0.350000 0.050000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.v b/cells/fill/sky130_fd_sc_hdll__fill_8.v
index 160c025..823022b 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.v
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__fill_8 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__fill_8 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
index 4c136ce..843113d 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso0n_1 A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI14 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 net36 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 sndA SLEEP_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI14 X net36 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 net36 SLEEP_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMN0 net36 A sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 X net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI13 sndA SLEEP_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net36 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 net36 SLEEP_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 X net36 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net36 A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso0n_1
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
index 64d33a1..f76f971 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.469100 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.955000 0.545000 2.205000 1.915000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
index db63838..1a00276 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__inputiso0n_1 (
     X      ,
     A      ,
-    SLEEP_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    SLEEP_B
 );
 
     output X      ;
     input  A      ;
     input  SLEEP_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
index e0fd1f5..439c8c0 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso0p_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI8 net36 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI8 net36 A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net36 sleepb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI7 net36 sleepb VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 X net36 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 X net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI19 sleepb SLEEP VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net36 sleepb sndA VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 sleepb SLEEP VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI21 X net36 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net36 sleepb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 sleepb SLEEP VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 sleepb SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI11 sndA A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 sndA A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso0p_1
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
index 6ed5e26..8c774e0 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.905000 0.775000 3.080000 1.580000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
index b01b160..7392cae 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__inputiso0p_1 (
     X    ,
     A    ,
-    SLEEP,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SLEEP
 );
 
     output X    ;
     input  A    ;
     input  SLEEP;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
index 9780a85..ee41745 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso1n_1 A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI23 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI23 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 VPWR net44 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI8 VPWR net44 X VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 net56 SLEEP_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MMIP0 net56 SLEEP_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 sndPA net56 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI7 sndPA net56 net44 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 net56 SLEEP_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net44 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 net56 SLEEP_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X net44 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net44 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X net44 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net44 net56 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI9 net44 net56 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso1n_1
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
index 58a46f0..cb23378 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.910000 0.760000 3.080000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
index 02d2c88..2e05bf9 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__inputiso1n_1 (
     X      ,
     A      ,
-    SLEEP_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    SLEEP_B
 );
 
     output X      ;
     input  A      ;
     input  SLEEP_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
index 12b41d8..ce86b4c 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__inputiso1p_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR SLEEP sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 sndPA A net36 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 sndPA A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI15 VPWR net36 X VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 VPWR net36 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI10 net36 A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net36 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net36 SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI16 net36 SLEEP VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 X net36 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 X net36 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inputiso1p_1
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
index 94b26fc..5a702b5 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.900000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
index 9132c5a..a15c7d2 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__inputiso1p_1 (
     X    ,
     A    ,
-    SLEEP,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SLEEP
 );
 
     output X    ;
     input  A    ;
     input  SLEEP;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.cdl b/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
index 372b5e7..3d773bb 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_1
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
index 3294568..6dd9aba 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.995000 0.885000 1.285000 1.485000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.380000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.v b/cells/inv/sky130_fd_sc_hdll__inv_1.v
index 2990ff1..b5eb807 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_1 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.cdl b/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
index ddc9cb9..f2814b0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_12 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_12
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
index f3fc1e6..2864209 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.000000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 5.970000 0.905000 6.320000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.v b/cells/inv/sky130_fd_sc_hdll__inv_12.v
index 740282b..b78ac1e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_12 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.cdl b/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
index e3ca388..b3ab203 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_16
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
index 6547350..9f5cefd 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
@@ -96,6 +84,22 @@
         RECT 7.160000 1.665000 7.540000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.v b/cells/inv/sky130_fd_sc_hdll__inv_16.v
index 5442b0b..f0ca08f 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_16 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.cdl b/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
index da0537e..9c0bde4 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_2
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
index fd4635e..b693b14 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -80,6 +68,22 @@
         RECT 0.605000 0.885000 0.905000 1.485000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.v b/cells/inv/sky130_fd_sc_hdll__inv_2.v
index f721014..ef3f173 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_2 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.cdl b/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
index 98d4d94..35612ee 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_4
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
index 0a93286..8135792 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.075000 ;
     DIRECTION INOUT ;
@@ -85,6 +73,22 @@
         RECT 2.395000 0.905000 2.665000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.v b/cells/inv/sky130_fd_sc_hdll__inv_4.v
index 17b5957..acff136 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_4 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.cdl b/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
index 9514fee..d479c99 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_6 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_6
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
index 00d38fc..23ace15 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.130000 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.865000 0.905000 3.265000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.v b/cells/inv/sky130_fd_sc_hdll__inv_6.v
index 5328b88..8529db0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_6 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.cdl b/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
index 4d17e78..a4fa742 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hdll__inv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__inv_8
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
index c3aa002..06048b0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -48,18 +48,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 4.185000 0.905000 4.505000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.v b/cells/inv/sky130_fd_sc_hdll__inv_8.v
index e759c70..8ae9045 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.v
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__inv_8 (
-    Y   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A
 );
 
-    output Y   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
index 512b8ed..b4ac7c3 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR SLEEP sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab X VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMN0 X SLEEP VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 X Ab VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_1
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
index 3de3e96..d89d594 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.328800 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.025000 0.815000 2.205000 1.850000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
index 9bbf492..e426c7e 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__isobufsrc_1 (
     X    ,
     SLEEP,
-    A    ,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    A
 );
 
     output X    ;
     input  SLEEP;
     input  A    ;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
index 373ad67..be35e61 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_16 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR Ab VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR Ab sndPA VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA SLEEP VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA SLEEP X VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 X Ab VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_16
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
index d69ae46..100263f 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
-  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 18.590000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.270000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 17.770000 0.905000 18.305000 1.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 18.590000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
index 9c36b3a..57a9c6d 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__isobufsrc_16 (
     X    ,
     SLEEP,
-    A    ,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    A
 );
 
     output X    ;
     input  SLEEP;
     input  A    ;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
index 5044ecb..3f1da04 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_2 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR SLEEP sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab X VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMN0 X SLEEP VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 X Ab VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_2
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
index 3e75921..117fea0 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.525000 0.895000 1.815000 2.125000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
index 470707a..362dfef 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__isobufsrc_2 (
     X    ,
     SLEEP,
-    A    ,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    A
 );
 
     output X    ;
     input  SLEEP;
     input  A    ;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
index 1ea48d0..45f010f 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_4 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR SLEEP sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab X VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 X Ab VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_4
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
index e079d84..34418d9 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
index 7290168..43b4dad 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__isobufsrc_4 (
     X    ,
     SLEEP,
-    A    ,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    A
 );
 
     output X    ;
     input  SLEEP;
     input  A    ;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
index 38f3932..ffb8397 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__isobufsrc_8 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR Ab sndPA VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA SLEEP VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA SLEEP X VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 X Ab VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__isobufsrc_8
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
index ae94da4..94ca771 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 9.050000 0.905000 9.565000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
index 3805609..d253fc7 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.v
@@ -76,20 +76,12 @@
 module sky130_fd_sc_hdll__isobufsrc_8 (
     X    ,
     SLEEP,
-    A    ,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    A
 );
 
     output X    ;
     input  SLEEP;
     input  A    ;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
index 63dd15c..446d9b2 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_1 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
index f9dfeda..5da410a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.420000 -0.085000 0.640000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.492600 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.v b/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
index 2ce12ac..d249317 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_1 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
index f25379d..8a1562a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_12 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_12
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index 50989ce..0891cd3 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
-  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 16.750000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.690000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 15.285000 1.665000 15.615000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.750000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.v b/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
index 852e47d..5f75edf 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_12 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
index 744a590..b20144a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_16 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_16
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 2b1a7ff..5ec9ce4 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
-  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 18.590000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.270000 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 17.165000 1.665000 17.495000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 18.590000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.v b/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
index 27b13a6..fd92b63 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_16 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
index a16846a..3ce0465 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 3ad64a8..f1709a4 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.776400 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.515000 1.595000 0.875000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.v b/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
index f68e1e8..763ecdd 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_2 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
index 5b65cfc..67d16ae 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index d75938d..2efb131 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.195000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 5.650000 0.805000 5.880000 1.575000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.v b/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
index 2c08a55..2a66e74 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_4 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl b/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
index 7908bbb..5039c3d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2_8 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA00 xb A0 smdNA0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 xb A1 sndNA1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN2 X xb VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 xb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 xb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2_8
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index b51f2c2..a609112 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.160000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 3.465000 1.745000 3.635000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.v b/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
index 69aaa1a..9ff159e 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2_8 (
-    X   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A0,
+    A1,
+    S
 );
 
-    output X   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
index 3df3b3c..33e1dc1 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Y A0 smdNA0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 Y A1 sndNA1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 2360c53..b4b2563 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.820000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.605000 1.455000 0.890000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
index b8daa7e..e88ed34 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2i_1 (
-    Y   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A0,
+    A1,
+    S
 );
 
-    output Y   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
index e1bc188..fa08a89 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Y A0 smdNA0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 Y A1 sndNA1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index 90bc3e2..4295963 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 5.255000 0.465000 5.425000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
index 608bb25..283257e 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2i_2 (
-    Y   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A0,
+    A1,
+    S
 );
 
-    output Y   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
index a327023..52b7bd1 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Y A0 smdNA0 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA10 Y A1 sndNA1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA11 sndNA1 S VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN1 Sb S VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR S sndPS VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb sndPSb VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index bae74a2..f1bd124 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.475000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.095000 2.255000 4.185000 2.425000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
index 3ba6292..9edb67f 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__mux2i_4 (
-    Y   ,
-    A0  ,
-    A1  ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A0,
+    A1,
+    S
 );
 
-    output Y   ;
-    input  A0  ;
-    input  A1  ;
-    input  S   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A0;
+    input  A1;
+    input  S ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
index 1ef0601..13aa0de 100644
--- a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
+++ b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
@@ -4590,6 +4590,86 @@
       RECT 224.525000  2.295000 224.815000 2.340000 ;
       RECT 224.525000  3.100000 224.815000 3.145000 ;
       RECT 224.525000  3.285000 224.815000 3.330000 ;
+    LAYER nwell ;
+      RECT  -0.190000 1.305000 225.590000 2.910000 ;
+      RECT 105.610000 2.910000 225.590000 4.135000 ;
+    LAYER pwell ;
+      RECT   0.420000 -0.085000   0.640000 0.085000 ;
+      RECT   5.480000 -0.085000   5.700000 0.085000 ;
+      RECT  11.460000 -0.085000  11.680000 0.085000 ;
+      RECT  15.785000 -0.085000  15.955000 0.085000 ;
+      RECT  24.525000 -0.085000  24.695000 0.085000 ;
+      RECT  30.505000 -0.085000  30.675000 0.085000 ;
+      RECT  30.965000 -0.085000  31.135000 0.085000 ;
+      RECT  36.945000 -0.085000  37.115000 0.085000 ;
+      RECT  37.405000 -0.085000  37.575000 0.085000 ;
+      RECT  49.825000 -0.085000  49.995000 0.085000 ;
+      RECT  50.285000 -0.085000  50.455000 0.085000 ;
+      RECT  62.705000 -0.085000  62.875000 0.085000 ;
+      RECT  63.165000 -0.085000  63.335000 0.085000 ;
+      RECT  67.305000 -0.085000  67.475000 0.085000 ;
+      RECT  71.445000 -0.085000  71.615000 0.085000 ;
+      RECT  75.585000 -0.085000  75.755000 0.085000 ;
+      RECT  79.725000 -0.085000  79.895000 0.085000 ;
+      RECT  80.185000 -0.085000  80.355000 0.085000 ;
+      RECT  86.165000 -0.085000  86.335000 0.085000 ;
+      RECT  86.625000 -0.085000  86.795000 0.085000 ;
+      RECT  92.605000 -0.085000  92.775000 0.085000 ;
+      RECT  93.065000 -0.085000  93.235000 0.085000 ;
+      RECT  99.045000 -0.085000  99.215000 0.085000 ;
+      RECT  99.505000 -0.085000  99.675000 0.085000 ;
+      RECT 105.485000 -0.085000 105.655000 0.085000 ;
+      RECT 105.945000 -0.085000 106.115000 0.085000 ;
+      RECT 111.925000 -0.085000 112.095000 0.085000 ;
+      RECT 124.345000 -0.085000 124.515000 0.085000 ;
+      RECT 130.785000 -0.085000 130.955000 0.085000 ;
+      RECT 134.925000 -0.085000 135.095000 0.085000 ;
+      RECT 139.065000 -0.085000 139.235000 0.085000 ;
+      RECT 143.205000 -0.085000 143.375000 0.085000 ;
+      RECT 147.345000 -0.085000 147.515000 0.085000 ;
+      RECT 147.805000 -0.085000 147.975000 0.085000 ;
+      RECT 153.785000 -0.085000 153.955000 0.085000 ;
+      RECT 154.245000 -0.085000 154.415000 0.085000 ;
+      RECT 160.225000 -0.085000 160.395000 0.085000 ;
+      RECT 160.685000 -0.085000 160.855000 0.085000 ;
+      RECT 166.665000 -0.085000 166.835000 0.085000 ;
+      RECT 167.125000 -0.085000 167.295000 0.085000 ;
+      RECT 173.105000 -0.085000 173.275000 0.085000 ;
+      RECT 173.565000 -0.085000 173.735000 0.085000 ;
+      RECT 185.985000 -0.085000 186.155000 0.085000 ;
+      RECT 186.445000 -0.085000 186.615000 0.085000 ;
+      RECT 198.865000 -0.085000 199.035000 0.085000 ;
+      RECT 199.325000  0.320000 199.495000 0.845000 ;
+      RECT 199.785000 -0.085000 199.955000 0.085000 ;
+      RECT 212.205000 -0.085000 212.375000 0.085000 ;
+      RECT 212.665000 -0.085000 212.835000 0.085000 ;
+      RECT 225.085000 -0.085000 225.255000 0.085000 ;
+    LAYER pwell ;
+      RECT 105.945000 5.355000 106.115000 5.525000 ;
+      RECT 111.925000 5.355000 112.095000 5.525000 ;
+      RECT 124.345000 5.355000 124.515000 5.525000 ;
+      RECT 130.785000 5.355000 130.955000 5.525000 ;
+      RECT 134.925000 5.355000 135.095000 5.525000 ;
+      RECT 139.065000 5.355000 139.235000 5.525000 ;
+      RECT 143.205000 5.355000 143.375000 5.525000 ;
+      RECT 147.345000 5.355000 147.515000 5.525000 ;
+      RECT 147.805000 5.355000 147.975000 5.525000 ;
+      RECT 153.785000 5.355000 153.955000 5.525000 ;
+      RECT 154.245000 5.355000 154.415000 5.525000 ;
+      RECT 160.225000 5.355000 160.395000 5.525000 ;
+      RECT 160.685000 5.355000 160.855000 5.525000 ;
+      RECT 166.665000 5.355000 166.835000 5.525000 ;
+      RECT 167.125000 5.355000 167.295000 5.525000 ;
+      RECT 173.105000 5.355000 173.275000 5.525000 ;
+      RECT 173.565000 5.355000 173.735000 5.525000 ;
+      RECT 185.985000 5.355000 186.155000 5.525000 ;
+      RECT 186.445000 5.355000 186.615000 5.525000 ;
+      RECT 198.865000 5.355000 199.035000 5.525000 ;
+      RECT 199.325000 4.595000 199.495000 5.120000 ;
+      RECT 199.785000 5.355000 199.955000 5.525000 ;
+      RECT 212.205000 5.355000 212.375000 5.525000 ;
+      RECT 212.665000 5.355000 212.835000 5.525000 ;
+      RECT 225.085000 5.355000 225.255000 5.525000 ;
   END
 END sky130_fd_sc_hdll__muxb
 END LIBRARY
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
index 5135140..96f8bd5 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI136 Z S[8] net0210 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI135 net0210 D[8] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI134 SB8 S[8] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI133 Z S[9] net0222 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI131 SB9 S[9] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI130 Z S[12] net0234 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI128 SB12 S[12] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI127 Z S[13] net0246 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI126 net0246 D[13] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI125 SB13 S[13] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI124 Z S[10] net0258 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI122 SB10 S[10] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI121 SB11 S[11] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI120 net0270 D[11] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI119 Z S[11] net0270 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI118 Z S[14] net0282 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI160 VPWR D[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI159 net0402 SB8 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI157 net0410 SB9 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI117 net0282 D[14] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI116 SB14 S[14] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI115 SB15 S[15] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI154 VPWR D[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI114 net0294 D[15] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] net0294 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI153 net0426 SB12 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI151 net0434 SB13 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI149 SB13 S[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI148 net0446 SB10 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI146 SB11 S[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI145 net0458 SB11 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI140 SB15 S[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI139 net0482 SB15 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] net0402 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI157 net0410 SB9 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] net0410 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] net0426 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] net0434 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] net0458 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] net0446 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] net0482 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] net0470 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_1
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index 1bd5143..f842bea 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -465,54 +465,6 @@
         RECT 0.000000 5.200000 17.020000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 5.355000 16.875000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 5.355000 8.595000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 17.210000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  6.380000 ;
     DIRECTION INOUT ;
@@ -764,6 +716,58 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 5.355000 16.875000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 5.355000 4.455000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 5.355000 8.595000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
index 1389587..e1404e3 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb16to1_1 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output        Z   ;
-    input  [15:0] D   ;
-    input  [15:0] S   ;
-    input         VPWR;
-    input         VGND;
-    input         VPB ;
-    input         VNB ;
+    output        Z;
+    input  [15:0] D;
+    input  [15:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
index ee93f72..5ccdc9c 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI136 Z S[8] net0210 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI135 net0210 D[8] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI134 SB8 S[8] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI133 Z S[9] net0222 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI131 SB9 S[9] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI130 Z S[12] net0234 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI128 SB12 S[12] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI127 Z S[13] net0246 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI126 net0246 D[13] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI125 SB13 S[13] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI124 Z S[10] net0258 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI122 SB10 S[10] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI121 SB11 S[11] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI120 net0270 D[11] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI119 Z S[11] net0270 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI118 Z S[14] net0282 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI160 VPWR D[8] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI159 net0402 SB8 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI157 net0410 SB9 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI117 net0282 D[14] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI116 SB14 S[14] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI115 SB15 S[15] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI154 VPWR D[12] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI114 net0294 D[15] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] net0294 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI153 net0426 SB12 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI151 net0434 SB13 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI149 SB13 S[13] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI148 net0446 SB10 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI146 SB11 S[11] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI145 net0458 SB11 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI140 SB15 S[15] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI139 net0482 SB15 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] net0402 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI157 net0410 SB9 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] net0410 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] net0426 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] net0434 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] net0458 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] net0446 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] net0482 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] net0470 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_2
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index 5d224b8..e878f2c 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -477,78 +477,6 @@
         RECT 0.000000 5.200000 25.760000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 5.355000 19.175000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 5.355000 19.635000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  7.520000 ;
     DIRECTION INOUT ;
@@ -694,6 +622,82 @@
         RECT 24.005000 3.640000 24.295000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 5.355000 19.175000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 5.355000 19.635000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 5.355000 6.755000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
index 1f0e0dd..d35226f 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb16to1_2 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output        Z   ;
-    input  [15:0] D   ;
-    input  [15:0] S   ;
-    input         VPWR;
-    input         VGND;
-    input         VPB ;
-    input         VNB ;
+    output        Z;
+    input  [15:0] D;
+    input  [15:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
index 46981b1..5ef0958 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.cdl
@@ -20,196 +20,196 @@
 *.PININFO D[0]:I S[15]:I S[14]:I S[13]:I S[12]:I S[11]:I S[10]:I
 *.PININFO S[9]:I S[8]:I S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I
 *.PININFO S[1]:I S[0]:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI136 Z S[8] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI135 net0210 D[8] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI134 SB8 S[8] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI133 Z S[9] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI132 net0222 D[9] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI131 SB9 S[9] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI130 Z S[12] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI129 net0234 D[12] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI128 SB12 S[12] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI127 Z S[13] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI126 net0246 D[13] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI125 SB13 S[13] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI124 Z S[10] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI123 net0258 D[10] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI122 SB10 S[10] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI121 SB11 S[11] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 net0270 D[11] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI119 Z S[11] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI118 Z S[14] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI117 net0282 D[14] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI116 SB14 S[14] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI115 SB15 S[15] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI114 net0294 D[15] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI136 Z S[8] net0210 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI113 Z S[15] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI135 net0210 D[8] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI134 SB8 S[8] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI133 Z S[9] net0222 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI132 net0222 D[9] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI131 SB9 S[9] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI130 Z S[12] net0234 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI129 net0234 D[12] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI128 SB12 S[12] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI127 Z S[13] net0246 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI126 net0246 D[13] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI125 SB13 S[13] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI124 Z S[10] net0258 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI123 net0258 D[10] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI122 SB10 S[10] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI121 SB11 S[11] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI120 net0270 D[11] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI119 Z S[11] net0270 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI118 Z S[14] net0282 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI117 net0282 D[14] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI116 SB14 S[14] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI160 VPWR D[8] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI159 net0402 SB8 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI158 SB8 S[8] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI157 net0410 SB9 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI156 VPWR D[9] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI155 SB9 S[9] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI154 VPWR D[12] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI153 net0426 SB12 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI152 SB12 S[12] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI115 SB15 S[15] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI151 net0434 SB13 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI114 net0294 D[15] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI113 Z S[15] net0294 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI150 VPWR D[13] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI149 SB13 S[13] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI148 net0446 SB10 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI147 SB10 S[10] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI146 SB11 S[11] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI145 net0458 SB11 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI144 VPWR D[11] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI143 VPWR D[10] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI142 net0470 SB14 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI141 SB14 S[14] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI140 SB15 S[15] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI139 net0482 SB15 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI138 VPWR D[15] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI137 VPWR D[14] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI160 VPWR D[8] net0402 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI159 net0402 SB8 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI158 SB8 S[8] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI157 net0410 SB9 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI156 VPWR D[9] net0410 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI155 SB9 S[9] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI154 VPWR D[12] net0426 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI153 net0426 SB12 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI152 SB12 S[12] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI151 net0434 SB13 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI150 VPWR D[13] net0434 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI149 SB13 S[13] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI148 net0446 SB10 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI147 SB10 S[10] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI146 SB11 S[11] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI145 net0458 SB11 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI144 VPWR D[11] net0458 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI143 VPWR D[10] net0446 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI142 net0470 SB14 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI141 SB14 S[14] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI140 SB15 S[15] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI139 net0482 SB15 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI138 VPWR D[15] net0482 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI137 VPWR D[14] net0470 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb16to1_4
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 5873c65..a1c23fb 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -647,92 +647,6 @@
         RECT 0.000000 5.200000 51.980000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 0.265000 26.135000 0.810000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 4.630000 26.135000 5.175000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 -0.085000 26.535000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 5.355000 26.535000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 -0.085000 38.955000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 5.355000 38.955000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 -0.085000 39.415000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 5.355000 39.415000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 -0.085000 51.835000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 5.355000 51.835000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 1.470000 26.135000 2.455000 ;
-        RECT 25.845000 2.985000 26.135000 3.970000 ;
-    END
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 52.170000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  20.364799 ;
     DIRECTION INOUT ;
@@ -956,6 +870,97 @@
         RECT 48.705000 3.640000 48.995000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 0.265000 26.135000 0.810000 ;
+      LAYER pwell ;
+        RECT 25.905000 0.320000 26.075000 0.845000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 4.630000 26.135000 5.175000 ;
+      LAYER pwell ;
+        RECT 25.905000 4.595000 26.075000 5.120000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 -0.085000 26.535000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 5.355000 26.535000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 -0.085000 38.955000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 5.355000 38.955000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 -0.085000 39.415000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 5.355000 39.415000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 -0.085000 51.835000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 5.355000 51.835000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 1.470000 26.135000 2.455000 ;
+        RECT 25.845000 2.985000 26.135000 3.970000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 52.170000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
index fe0ff17..3e53671 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb16to1_4 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output        Z   ;
-    input  [15:0] D   ;
-    input  [15:0] S   ;
-    input         VPWR;
-    input         VGND;
-    input         VPB ;
-    input         VNB ;
+    output        Z;
+    input  [15:0] D;
+    input  [15:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
index 571e2fd..745dbfb 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_1 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_1
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index 5bb972d..cffd133 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -119,18 +119,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.690000 ;
     DIRECTION INOUT ;
@@ -157,6 +145,22 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
index ce370b8..190d618 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb4to1_1 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [3:0] D   ;
-    input  [3:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [3:0] D;
+    input  [3:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
index 474d842..f44e7f8 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_2 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_2
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index 43f78ad..bd9732e 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -150,30 +150,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.070000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880000 ;
     DIRECTION INOUT ;
@@ -243,6 +219,34 @@
         RECT 11.125000 1.940000 11.415000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
index 51a56ea..3952b2e 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb4to1_2 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [3:0] D   ;
-    input  [3:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [3:0] D;
+    input  [3:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
index f592dfc..60dec6a 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.cdl
@@ -17,52 +17,52 @@
 .SUBCKT sky130_fd_sc_hdll__muxb4to1_4 D[3] D[2] D[1] D[0] S[3] S[2] S[1] S[0] VGND VNB VPB VPWR Z
 *.PININFO D[3]:I D[2]:I D[1]:I D[0]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb4to1_4
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index fa61570..3f3ee31 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -192,30 +192,6 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  5.091200 ;
     DIRECTION INOUT ;
@@ -331,6 +307,34 @@
         RECT 22.485000 1.940000 22.775000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
index b312d1e..0d3a7ee 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb4to1_4 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [3:0] D   ;
-    input  [3:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [3:0] D;
+    input  [3:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
index ca4d6d9..0a14cd7 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=1 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_1
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index f045a3f..bfebf2e 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -250,34 +250,6 @@
         RECT 0.000000 -0.240000 17.020000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 17.210000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.190000 ;
     DIRECTION INOUT ;
@@ -451,6 +423,38 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
index 47d036c..c6f14a2 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb8to1_1 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [7:0] D   ;
-    input  [7:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [7:0] D;
+    input  [7:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
index b172654..4d4b40b 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=2 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_2
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index 8c1af27..199f707 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -256,46 +256,6 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.760000 ;
     DIRECTION INOUT ;
@@ -411,6 +371,50 @@
         RECT 24.005000 1.940000 24.295000 1.985000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
index 5502363..26dd7c8 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb8to1_2 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [7:0] D   ;
-    input  [7:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [7:0] D;
+    input  [7:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
index 489e37e..6369936 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.cdl
@@ -18,100 +18,100 @@
 *.PININFO D[7]:I D[6]:I D[5]:I D[4]:I D[3]:I D[2]:I D[1]:I D[0]:I
 *.PININFO S[7]:I S[6]:I S[5]:I S[4]:I S[3]:I S[2]:I S[1]:I S[0]:I
 *.PININFO VGND:I VNB:I VPB:I VPWR:I Z:O
-MMNA00 Z S[0] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 net87 D[0] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA00 Z S[0] net87 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 SB0 S[0] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 net87 D[0] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 Z S[2] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net51 D[2] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN1 SB0 S[0] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 SB2 S[2] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SB3 S[3] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net63 D[3] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI30 Z S[2] net51 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Z S[3] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Z S[1] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net75 D[1] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI29 net51 D[2] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 SB1 S[1] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI67 Z S[4] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI66 net073 D[4] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI28 SB2 S[2] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI65 SB4 S[4] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 Z S[6] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI63 net085 D[6] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI27 SB3 S[3] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI62 SB6 S[6] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI61 SB7 S[7] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net097 D[7] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 net63 D[3] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 Z S[7] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 Z S[5] VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net0109 D[5] VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI25 Z S[3] net63 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI56 SB5 S[5] VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 net99 SB2 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI13 Z S[1] net75 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 SB2 S[2] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI12 net75 D[1] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR D[0] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI11 SB1 S[1] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 net135 SB0 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI67 Z S[4] net073 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 SB3 S[3] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI66 net073 D[4] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net111 SB3 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI65 SB4 S[4] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 VPWR D[3] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI64 Z S[6] net085 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 SB0 S[0] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI63 net085 D[6] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net123 SB1 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI62 SB6 S[6] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 VPWR D[1] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI61 SB7 S[7] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 SB1 S[1] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI60 net097 D[7] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 VPWR D[2] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI59 Z S[7] net097 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI79 net0165 SB6 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI58 Z S[5] net0109 VNB nfet_01v8 m=4 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI78 SB6 S[6] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI57 net0109 D[5] VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI77 VPWR D[4] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI56 SB5 S[5] VGND VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI76 net0177 SB4 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI35 net99 SB2 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI75 SB7 S[7] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI34 SB2 S[2] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI74 net0185 SB7 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MMPA00 VPWR D[0] net135 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 net135 SB0 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 SB3 S[3] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI73 VPWR D[7] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI32 net111 SB3 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI72 SB4 S[4] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI31 VPWR D[3] net111 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 SB0 S[0] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 net123 SB1 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI71 net0197 SB5 VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
+MI16 VPWR D[1] net123 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 SB1 S[1] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI70 VPWR D[5] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI36 VPWR D[2] net99 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI79 net0165 SB6 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI69 SB5 S[5] VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
+MI78 SB6 S[6] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI68 VPWR D[6] VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI77 VPWR D[4] net0177 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI76 net0177 SB4 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI75 SB7 S[7] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI74 net0185 SB7 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI73 VPWR D[7] net0185 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI72 SB4 S[4] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI71 net0197 SB5 Z VPB pfet_01v8_hvt m=4 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI70 VPWR D[5] net0197 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI69 SB5 S[5] VPWR VPB pfet_01v8_hvt m=2 w=0.82 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI68 VPWR D[6] net0165 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__muxb8to1_4
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index 3b2de72..00f44a5 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -341,38 +341,6 @@
         RECT 0.000000 5.200000 24.840000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 -0.085000 18.715000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 5.355000 18.715000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.030000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  9.422400 ;
     DIRECTION INOUT ;
@@ -494,6 +462,42 @@
         RECT 22.325000 3.640000 22.615000 3.685000 ;
     END
   END Z
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 -0.085000 18.715000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 5.355000 18.715000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.030000 4.135000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 2.635000  2.035000 2.805000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
index 9ecac57..b5119a4 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__muxb8to1_4 (
-    Z   ,
-    D   ,
-    S   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Z,
+    D,
+    S
 );
 
-    output       Z   ;
-    input  [7:0] D   ;
-    input  [7:0] S   ;
-    input        VPWR;
-    input        VGND;
-    input        VPB ;
-    input        VNB ;
+    output       Z;
+    input  [7:0] D;
+    input  [7:0] S;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
index fc307c9..07f794d 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index 1e7599e..5d8fb50 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 0.650000 0.885000 0.820000 1.485000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.v b/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
index 0813919..f866832 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_1 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
index befc1c0..c3d20d9 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_12 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=12 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=12 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_12
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index 68415a4..1af0a07 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.730000 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 10.965000 1.325000 11.235000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.v b/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
index 00fabd8..307d1f6 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_12 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
index 2d8cae4..ef0130f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_16 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=16 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=16 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_16
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index 38ea4d3..e47b813 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.890000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 14.725000 1.325000 14.995000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.v b/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
index 0f5fe99..b290ae4 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_16 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
index 13062a9..2405a6f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index c68e199..aa31d90 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.830000 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.950000 0.905000 2.230000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.v b/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
index f4b25c3..721f32c 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_2 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
index f703492..b3152cd 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 61a396a..43b2275 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 3.335000 1.665000 3.715000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.v b/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
index 52accad..48e26a5 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_4 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
index dc9a9b4..5d64a33 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_6 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_6
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index 38a5bea..a2efc9b 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 5.325000 1.325000 5.595000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.v b/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
index c4f2d46..87b23db 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_6 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl b/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
index efe3a3f..5a27a3e 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index 89e5e25..6e86282 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.690000 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 7.225000 0.905000 7.475000 1.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.v b/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
index 17a6260..fff0135 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2_8 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
index cd688f4..c81630c 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_1 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index 446f058..142b875 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.575700 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 1.820000 0.545000 2.190000 1.835000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
index c89ae93..d190c3e 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2b_1 (
-    Y   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
index 0b29241..90a05a8 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_2 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index ca8c80f..fbf91d0 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.062800 ;
     DIRECTION INOUT ;
@@ -92,6 +80,22 @@
         RECT 2.340000 1.495000 2.615000 1.835000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
index 7f88cf6..545ca03 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2b_2 (
-    Y   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
index 057f942..34fd00b 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand2b_4 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index e006fb9..12eadbc 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.825000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 4.340000 1.665000 4.720000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
index 3257cd3..9fb9859 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand2b_4 (
-    Y   ,
-    A_N ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
index 214d7e3..5b91ec1 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index 0d18eed..6a0d684 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 1.515000 1.665000 1.895000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.v b/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
index ea1d61c..128597d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
index bc2b31d..964fb48 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index 58af2ed..4921d4d 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.915000 1.665000 3.295000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.v b/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
index 8795b15..0eb8794 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl b/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
index b7a23e4..c142146 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index 6e4bacd..a2e7e5f 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.250000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 6.555000 0.905000 6.785000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.v b/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
index 9fb89a6..b361895 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
index 95aa4ff..871b52a 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_1 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index 379689d..8e460fe 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.605700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.410000 0.485000 2.675000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
index 09bf755..0c9f600 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3b_1 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
index eec28cd..1bf14ed 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_2 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index 59d7177..5ffc550 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.465700 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 4.250000 0.905000 4.490000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
index d2d8834..23a1d25 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3b_2 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
index a6cc402..06d843f 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand3b_4 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index a5b3159..cb29503 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 6.725000 1.665000 7.105000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
index d130405..da7d8a7 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand3b_4 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
index fbc1eca..12aeb6d 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index ea003f4..3d129d8 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 1.775000 0.825000 1.945000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.v b/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
index d41c910..21da58e 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
index d0b319f..ed13d8a 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index 8c25fae..674c47e 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.180000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 3.945000 1.665000 4.325000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.v b/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
index 510b92d..e3f9b2a 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl b/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
index fdcb16f..3d94804 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index 205abc7..975300a 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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.925000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.150000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 7.675000 1.665000 8.055000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.925000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.v b/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
index f9f8725..ba5a62d 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
index 0385593..43ccb2c 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index c720120..4d268d8 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.015700 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.875000 0.835000 3.135000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
index 5a1573d..db41f02 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4b_1 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
index 5fb7dd7..7615427 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index 2f514de..7941c66 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.223400 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 4.885000 1.665000 5.265000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
index 223da97..0c2ddaa 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4b_2 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
index ac8463b..a90c81c 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index 44e20a6..7b3100e 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.360000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 8.605000 1.665000 8.985000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
index 20310fc..3af631c 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4b_4 (
-    Y   ,
-    A_N ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B  ,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B  ;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
index 59c8c18..75a0b3e 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index b7ed3c6..88fe2c2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.132500 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 2.410000 0.825000 2.680000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
index 6bf857a..649fe06 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4bb_1 (
-    Y   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
index 4c091bf..ccef533 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index d5e1b2c..ef100f2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.021800 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 5.495000 1.665000 5.875000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
index ec37cd2..2c501d0 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4bb_2 (
-    Y   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
index bf3d3f9..cea7967 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 Y A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 Y B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 Y D VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 A A_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A sndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B sndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C sndC VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index 437ae02..883e6c8 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  3.425000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 9.485000 1.665000 9.865000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
index ce53eac..37e21d2 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nand4bb_4 (
-    Y   ,
-    A_N ,
-    B_N ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A_N,
+    B_N,
+    C  ,
+    D
 );
 
-    output Y   ;
-    input  A_N ;
-    input  B_N ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A_N;
+    input  B_N;
+    input  C  ;
+    input  D  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
index fd49b8e..78729db 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index c8a5535..c089103 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 0.605000 0.895000 0.775000 1.495000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.v b/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
index 9ac0fdc..00099e6 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2_1 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
index c4e8114..6a1c8ee 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index 9071599..5246d2f 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 2.095000 0.905000 2.310000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.v b/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
index 0a20af2..9d40204 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2_2 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
index 3fda171..76ff554 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index a7ca4eb..669a4ec 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 4.095000 0.905000 4.490000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.v b/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
index fdc6900..56ce4c7 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2_4 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl b/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
index 7d64791..5792bb6 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index 2184894..0590f76 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 7.460000 0.905000 8.025000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.v b/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
index 6cfe636..e0fc14c 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2_8 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
index 6ab1117..188e185 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_1 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 1c43516..4ff97de 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.366600 ;
     DIRECTION INOUT ;
@@ -90,6 +78,22 @@
         RECT 2.035000 0.895000 2.215000 1.850000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
index aae5b06..5140d66 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2b_1 (
-    Y   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
index a5ef8d1..f043c82 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_2 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index 5f94fe2..cd3210b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -58,18 +58,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.565000 0.895000 1.815000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
index a27e648..d4f8c8c 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2b_2 (
-    Y   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
index 8b61cf2..a17f05b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor2b_4 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index 56d073f..4a6e597 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
index 2fac587..6006ae6 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor2b_4 (
-    Y   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
index e8ce783..c1118c8 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_1 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index ee4667e..2e2deca 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
@@ -102,6 +90,22 @@
         RECT 1.245000 0.825000 1.415000 2.280000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.v b/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
index 4a6820f..4b85d39 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
index 13935a1..5116c71 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index 8e2d559..9d516eb 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 3.480000 0.905000 3.995000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.v b/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
index 6555bfa..30a3ed3 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl b/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
index cf97944..b7ae92a 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index d591bb3..70f8d3c 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 6.055000 0.905000 6.345000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.v b/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
index ab0fd38..f738d7b 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
index 86f20f6..3b01a1e 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_1 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index e531e94..b857a0f 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.375000 0.310000 1.545000 0.655000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
index b8872e6..16d2884 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3b_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
index c6ced97..ee89edf 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_2 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 960d8a6..bd4c45d 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.935000 0.255000 3.355000 0.725000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
index 7932a0c..4067560 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3b_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
index 922d580..4f8d03e 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor3b_4 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index ab78ee9..ca91506 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 6.905000 0.905000 7.245000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
index cc673b7..2459dfc 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor3b_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
index 91531c4..06594d3 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index edf473b..795a667 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 1.595000 0.385000 1.765000 0.655000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.v b/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
index d9340ce..ff45464 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
index 9d0e6a2..e567e99 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index ff78e2a..f9cd5d3 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 4.615000 0.905000 4.950000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.v b/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
index a358c58..0f59c62 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
index f1f0b93..eae722a 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 87db99d..6bddaa6 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 8.360000 0.905000 8.630000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.v b/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
index 4516b46..2c75093 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
index 542ed8c..d42fdb2 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_6 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_6
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index e9f0178..3168c00 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
-  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.610000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -122,6 +110,22 @@
         RECT 11.445000 1.625000 11.835000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.v b/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
index 5e206ed..c2cef53 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4_6 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl b/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
index c75c0d6..ed74435 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4_8 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hdll__nor4_8
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index 896462c..27a8b6b 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 16.100000 0.240000 ;
     END
   END VGND
-  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 16.290000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -127,6 +115,22 @@
         RECT 15.225000 1.625000 15.475000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.290000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.100000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.v b/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
index be1dd3c..94db209 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4_8 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B,
+    C,
+    D
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
index 7f26a38..65c9761 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index 127b727..8177d2e 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.479900 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 1.875000 0.310000 2.075000 0.655000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
index 34a8f2e..3dee5be 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4b_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
index 27fe0b2..fb4f6b2 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index d9df8dd..f869a2b 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
@@ -114,6 +102,22 @@
         RECT 4.065000 1.075000 4.490000 1.455000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
index 34021e5..aa93499 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4b_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
index 8716ee1..83ac15b 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index 8090173..11135bd 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 7.705000 1.625000 7.955000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
index f0addfa..93305f6 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4b_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
index 8090eed..e21b4b1 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index 3559ae8..12fec98 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.523625 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.140000 0.310000 3.340000 0.655000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
index fb92d12..e9414e6 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4bb_1 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
index ea2e15b..5c4159b 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index 21b21d3..478b78e 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.543625 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 5.455000 0.255000 5.835000 0.725000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
index f23a636..86e3b11 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4bb_2 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
index 03b1c6e..bf750b6 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index eaee033..28bd6df 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 9.135000 0.255000 9.515000 0.725000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
index 4206303..928e1ad 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__nor4bb_4 (
-    Y   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
index 7c9a29d..03c893f 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index 0a7c80d..fa979cf 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.070000 ;
     DIRECTION INOUT ;
@@ -108,6 +96,22 @@
         RECT 0.085000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.v b/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
index 60e06f7..0da742f 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211a_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
index 2906ab7..8f4c95b 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index 5b10202..a4c5952 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.120000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.765000 0.785000 4.035000 1.905000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.v b/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
index ee932ca..4267706 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211a_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl b/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
index afd5370..d94cbe8 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index cfa312f..47321c3 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.795000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 2.040000 1.700000 2.230000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.v b/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
index d365544..2658272 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211a_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
index f615b57..4e7363b 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index 4c9a1bf..788a887 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 2.440000 0.825000 2.675000 1.815000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
index 2dba77e..bc26f08 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
index 5671f1d..3f87995 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index 644f770..c4fe57b 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.150000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 3.025000 1.710000 3.405000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
index c806f5c..fdc3f52 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
index 5b6c1a6..21201d6 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 4ef454b..ae144a6 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -81,18 +81,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.480000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 7.980000 1.340000 8.480000 1.855000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
index d0f86d1..41c827e 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o211ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
index 8c9defc..b82d765 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index 7caca97..db17995 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.255000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.030000 0.365000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.v b/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
index 5bfbaf8..ec7837b 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21a_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
index 17112b7..37a4cf7 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 5a47fab..fc2e330 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.365000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.530000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.v b/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
index a659da7..13a77a8 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21a_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl b/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
index 6ab9f00..8c3940b 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index c04bf19..dd4c510 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 1.975000 1.700000 2.155000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.v b/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
index f7d33d8..aece0e1 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21a_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
index 9e15df8..ff2baff 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.7 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=1 w=0.7 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 26d1f92..f12811c 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.651500 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 1.645000 0.275000 2.110000 0.955000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
index 34c77cf..43e5e83 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
index eb37a11..984c379 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index 753134d..103eb2e 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.995000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 2.695000 1.965000 3.110000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
index 007ebf5..3ff3a28 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
index 3ce886b..403c29a 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index ca75d28..1806c4b 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 5.920000 0.845000 6.330000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
index 37349f1..dcfcc87 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o21ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
index 95e5370..e021188 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index b159a37..d0818da 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.925700 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.480000 0.425000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
index aa09ba4..0ad2264 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
index f0b9d48..2d3db4a 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index 5e0bc1e..c046501 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.380700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 0.995000 1.495000 1.455000 1.695000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
index 04375fe..c74e16b 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
index 8f94c66..f724526 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index c0b5fe7..3ba5350 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 2.045000 0.255000 2.375000 0.725000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
index c31eda9..fb29001 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.v
@@ -81,21 +81,13 @@
     X   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output X   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
index dc30652..3adcb52 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index e165a97..60967a5 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.660700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 1.635000 1.625000 2.155000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
index deacd54..9af2b85 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
index de51444..68ea342 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index c5f0af3..6302632 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.865700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.655000 1.615000 2.900000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
index fd69897..4b81542 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
index 718b840..3a2afbf 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIPB1N B1 B1_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index 329d802..5979203 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 4.515000 1.625000 4.765000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
index 57a8b4e..cf89fd8 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.v
@@ -81,21 +81,13 @@
     Y   ,
     A1  ,
     A2  ,
-    B1_N,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B1_N
 );
 
     output Y   ;
     input  A1  ;
     input  A2  ;
     input  B1_N;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
index 025d676..25d1547 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index 369c48c..ed75f7c 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -85,18 +85,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 3.715000 0.825000 4.030000 1.875000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.v b/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
index f254e31..bfaf1e2 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221a_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
index 7964bf2..a542174 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index c246876..3fd44e3 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 4.180000 0.905000 4.490000 1.875000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.v b/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
index 829b884..b9d8b9e 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221a_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl b/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
index b17e1ea..cd9c7cd 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 pndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index 062612c..df9aadb 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.220000 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 7.365000 0.905000 7.710000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.v b/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
index f3c1d04..bf1c03e 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221a_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
index 1fc2475..484e065 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index da3ba42..0d8e818 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -87,18 +87,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.240000 ;
     DIRECTION INOUT ;
@@ -123,6 +111,22 @@
         RECT 1.900000 2.180000 2.505000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
index 47cfcf8..9dea01e 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
index 7c2d8c6..a2b144c 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index ee0fce1..6ae8af9 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.745000 ;
     DIRECTION INOUT ;
@@ -125,6 +113,22 @@
         RECT 4.500000 1.955000 4.750000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
index 3c368e8..ac4c7e2 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
index ec713ed..a1cb3ad 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPC0 VPWR C1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 pndB B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 pndB B2 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 pndB VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index fae47fb..ebadcef 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -90,18 +90,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.645000 ;
     DIRECTION INOUT ;
@@ -127,6 +115,22 @@
         RECT 4.345000 1.785000 8.565000 2.005000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
index 27afd6e..d572677 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o221ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    C1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2,
+    C1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  C1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
+    input  C1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
index 9786a05..620ddf6 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index 2025be2..a549b9b 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.980000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.085000 0.365000 0.365000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.v b/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
index 959d788..197d128 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22a_1 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
index 7bbe464..e0755fd 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index 2aed76a..da233c5 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 4.330000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.380000 ;
     DIRECTION INOUT ;
@@ -106,6 +94,22 @@
         RECT 0.605000 0.365000 0.855000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.085000 0.300000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.v b/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
index 42f3571..ce2ada3 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22a_2 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl b/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
index 0ec8348..1acfd30 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index 32ec55e..eef5e5e 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.055000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.v b/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
index d622221..7a02f1d 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22a_4 (
-    X   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output X   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
index 859eace..09acb0f 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index fb2f74d..df5fd34 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.550000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 1.130000 2.045000 1.680000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
index d2325f4..0ce93d9 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
index a0ad8cf..295d47f 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index a5ddf68..dab5257 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 3.065000 1.625000 3.315000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
index 6a18553..159ede8 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
index fb72e82..0d3fd41 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index 702184a..78e3217 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -80,18 +80,6 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
@@ -120,6 +108,22 @@
         RECT 7.905000 0.820000 8.170000 1.785000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
index 3fab697..50a015a 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o22ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
index 5128a8f..16a2a7d 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand nmid VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index 38d9f87..33ac18e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -78,18 +78,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.839800 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.085000 1.795000 0.345000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
index dfc6750..cc1b146 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
index faeeb13..a4af347 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MMNaoi20 y inand nmid VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 y VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index b3eaaaa..05cf3a2 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.255800 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 0.535000 1.795000 0.840000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
index 1b3341c..baf17c6 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
index 65a174a..7a0761e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIN2 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 y inand nmid VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index 8f18a4e..0915129 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.510000 ;
     DIRECTION INOUT ;
@@ -117,6 +105,22 @@
         RECT 7.405000 0.905000 7.710000 1.415000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
index 457929c..325f8e0 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output X   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
index 023db07..8245edf 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index b7026ed..c60a143 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.275000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 1.950000 1.665000 2.275000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
index 812a9e9..67bc949 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
index 0ba470f..4a5f0f1 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 331d6b9..5bfcc78 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.960000 ;
     DIRECTION INOUT ;
@@ -113,6 +101,22 @@
         RECT 4.430000 1.955000 4.680000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
index 8b4d8e1..9e4fa50 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
index 3975fb4..b95b86c 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N sndNA1N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA1N A2_N inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid B1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 sndPB1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index 9e96437..01e00d8 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 11.230000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.080000 ;
     DIRECTION INOUT ;
@@ -111,6 +99,22 @@
         RECT 8.215000 1.625000 8.465000 2.125000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
index 690710a..5cce705 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.v
@@ -84,11 +84,7 @@
     A1_N,
     A2_N,
     B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    B2
 );
 
     output Y   ;
@@ -96,10 +92,6 @@
     input  A2_N;
     input  B1  ;
     input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
index 5ca922c..95457e6 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index a92462a..597f20a 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 1.885000 0.825000 2.155000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT -0.015000  2.635000 2.760000 2.805000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
index 1e69bf3..a6480e6 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o31ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
index 1dc013b..6779805 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index 4edf7bc..41f9902 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 4.625000 1.665000 4.965000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
index 44fecab..bb1659c 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o31ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
index 9df47cd..ccf38d8 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index 27329ee..745d014 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 8.300000 1.695000 8.625000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
index 51dc743..f5042a9 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.v
@@ -80,26 +80,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o31ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
index 97578b3..224786a 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index 32c078b..12681a2 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 0.530000 1.785000 1.530000 2.465000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
index 77733ba..3fd314f 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o32ai_1 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
index ce3d464..bb89f69 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index 2198333..f87cce2 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
@@ -119,6 +107,22 @@
         RECT 3.025000 1.665000 3.405000 2.085000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
index 6dec6e6..843cce3 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o32ai_2 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
index 918ca33..ca7d03e 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA0 VPWR A1 sndA1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPA1 sndA1 A2 sndA2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB0 VPWR B1 sndB1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPB1 sndB1 B2 Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMNA0 pndA A1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 pndA A3 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 pndA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index cd858bb..6293a45 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
@@ -120,6 +108,22 @@
         RECT 5.750000 1.665000 6.130000 2.085000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
index f1da455..633c564 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.v
@@ -83,28 +83,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__o32ai_4 (
-    Y   ,
-    A1  ,
-    A2  ,
-    A3  ,
-    B1  ,
-    B2  ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y ,
+    A1,
+    A2,
+    A3,
+    B1,
+    B2
 );
 
-    output Y   ;
-    input  A1  ;
-    input  A2  ;
-    input  A3  ;
-    input  B1  ;
-    input  B2  ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y ;
+    input  A1;
+    input  A2;
+    input  A3;
+    input  B1;
+    input  B2;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.cdl b/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
index ff00988..9ae107d 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_1
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index aac7ef5..62de706 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 1.915000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.v b/cells/or2/sky130_fd_sc_hdll__or2_1.v
index 525f6e4..352e776 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2_1 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.cdl b/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
index a637b7e..5f25ca4 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_2
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index 8c9af00..84e63a9 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.595700 ;
     DIRECTION INOUT ;
@@ -91,6 +79,22 @@
         RECT 1.935000 0.825000 2.415000 1.835000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.v b/cells/or2/sky130_fd_sc_hdll__or2_2.v
index d544e8d..bb69e32 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2_2 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.cdl b/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
index 0f17836..a999ed0 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_4
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index a8a8ca7..ebc9d1f 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.955000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 2.825000 0.905000 3.170000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.v b/cells/or2/sky130_fd_sc_hdll__or2_4.v
index 25069a9..a06d943 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2_4 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.cdl b/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
index 0babe94..7e0f0da 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_6 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=6 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=6 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_6
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 60d3264..c94255c 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 5.015000 0.905000 5.415000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.v b/cells/or2/sky130_fd_sc_hdll__or2_6.v
index 1ad962e..7a00ef3 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2_6 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.cdl b/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
index bf21272..1caf36a 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2_8 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2_8
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index 164df76..eb075a6 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.710000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 5.935000 0.905000 6.335000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.v b/cells/or2/sky130_fd_sc_hdll__or2_8.v
index 67069aa..24d0a31 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.v
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2_8 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
index 547f41b..6f59ce7 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_1 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index 74bcbd2..95ea154 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -89,6 +77,22 @@
         RECT 2.705000 0.760000 3.090000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.v b/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
index 06be038..db0e845 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2b_1 (
-    X   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
index 9a44a33..7dbdc9a 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_2 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index 4269ae5..5b68d69 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.719100 ;
     DIRECTION INOUT ;
@@ -87,6 +75,22 @@
         RECT 2.790000 0.415000 3.110000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.v b/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
index ee4499e..7773ffd 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2b_2 (
-    X   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl b/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
index e1365d0..a6b5466 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or2b_4 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP1 B B_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index a3cfd58..39086f2 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.068400 ;
     DIRECTION INOUT ;
@@ -95,6 +83,22 @@
         RECT 4.105000 0.905000 4.490000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.v b/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
index 3065b93..5f45866 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.v
@@ -72,22 +72,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or2b_4 (
-    X   ,
-    A   ,
-    B_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.cdl b/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
index 576524a..d5ebddc 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_1
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index 09b599b..fa93df2 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
-  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.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.445000 0.760000 2.615000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.v b/cells/or3/sky130_fd_sc_hdll__or3_1.v
index b65c192..6275180 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.cdl b/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
index becb958..afec694 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_2
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index 59f5ab5..4a4c4c4 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.825700 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 2.470000 0.760000 2.655000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.v b/cells/or3/sky130_fd_sc_hdll__or3_2.v
index e441bd0..6b80f17 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.cdl b/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
index 6e0fc3e..e629377 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3_4
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index b5c080f..85a8a62 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 4.115000 0.905000 4.455000 1.445000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.v b/cells/or3/sky130_fd_sc_hdll__or3_4.v
index 714a00c..648ef1a 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.v
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
index 1b1eff5..5a19f12 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_1 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index adb4414..2d6fdef 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 3.215000 0.760000 3.535000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.v b/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
index 15a31b7..07d17c6 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3b_1 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
index 2022522..cb9c4f0 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_2 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index ca3f206..9ff461b 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.616400 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.985000 1.495000 1.430000 1.700000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.v b/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
index 420fc03..f29c35a 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3b_2 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl b/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
index 622372b..437cdc4 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or3b_4 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP3 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index 109bc07..b9f8327 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.885700 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 2.005000 0.255000 2.240000 0.735000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.v b/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
index ef7a8f8..2cedc05 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or3b_4 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.cdl b/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
index ff13dae..d47754f 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_1
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index 4aa5183..4bb4fe1 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.905000 0.760000 3.075000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.v b/cells/or4/sky130_fd_sc_hdll__or4_1.v
index 5ddea2e..cc4576b 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.cdl b/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
index e1751f7..1501b32 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_2
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index 9e5763b..cd965fb 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.625700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 2.890000 0.760000 3.125000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.v b/cells/or4/sky130_fd_sc_hdll__or4_2.v
index df7340a..3959e30 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.cdl b/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
index 50e5da5..e31ff04 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4_4
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index a98c769..3b4a1ff 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
@@ -115,6 +103,22 @@
         RECT 4.210000 0.905000 4.485000 1.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.v b/cells/or4/sky130_fd_sc_hdll__or4_4.v
index 71d7336..1f432f6 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.v
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C,
+    D
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
+    input  D;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
index 0fd944f..80c2164 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_1 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index 14db3aa..a81568e 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 3.725000 0.760000 3.995000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.v b/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
index 92ca557..8d7122f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4b_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
index 7e978cc..58a94e3 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_2 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index cf251e3..d623d07 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.722700 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 1.020000 1.495000 1.350000 1.825000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.v b/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
index 049acc7..b4e5b72 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4b_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl b/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
index e1c5fe9..d9e3081 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4b_4 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index ad328d8..7f3f1e0 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.073400 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 5.175000 0.905000 5.415000 1.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.v b/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
index 060bfc3..6051d1b 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4b_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C  ,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C  ;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
index 5fd9c35..f571c51 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index e853f15..752766b 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.564325 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 4.235000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
index 1fc4903..34c1c71 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4bb_1 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
index 7317a7d..178c39e 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index 697fcc9..8da1ef5 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -75,18 +75,6 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.859325 ;
     DIRECTION INOUT ;
@@ -107,6 +95,22 @@
         RECT 4.260000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
index 67c53bd..8d46bf9 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4bb_2 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
index 9690dd8..17181f5 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hdll__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP1 sndPA B sndPB VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP2 sndPB C sndPC VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMP3 sndPC D y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP2 C C_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MMIP3 D D_N VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIP4 X y VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 C C_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 D D_N VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index edc5d7c..e912f09 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -76,18 +76,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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.285000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.203625 ;
     DIRECTION INOUT ;
@@ -112,6 +100,22 @@
         RECT 5.625000 0.905000 5.855000 1.455000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.285000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
index 64a47f3..2bbdc75 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__or4bb_4 (
-    X   ,
-    A   ,
-    B   ,
-    C_N ,
-    D_N ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X  ,
+    A  ,
+    B  ,
+    C_N,
+    D_N
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C_N ;
-    input  D_N ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X  ;
+    input  A  ;
+    input  B  ;
+    input  C_N;
+    input  D_N;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
index efe0147..adddc6f 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.cdl
@@ -16,13 +16,13 @@
 
 .SUBCKT sky130_fd_sc_hdll__probe_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net29 Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net29 Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
+MMIP2 net29 Ab VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net29 Ab VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 rI112 net29 X short
 .ENDS sky130_fd_sc_hdll__probe_p_8
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index 021df61..fed846f 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -72,18 +72,6 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
@@ -125,6 +113,22 @@
         RECT 1.250000 1.950000 4.270000 2.160000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
index e9cf573..6a7746e 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__probe_p_8 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
index 0996d00..1295e7e 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.cdl
@@ -16,13 +16,13 @@
 
 .SUBCKT sky130_fd_sc_hdll__probec_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 Ab A VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net33 Ab VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP1 Ab A VPWR VPB pfet_01v8_hvt m=3 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net33 Ab VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
+MMIP2 net33 Ab VPWR VPB pfet_01v8_hvt m=8 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VGND VNB nfet_01v8 m=3 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net33 Ab VGND VNB nfet_01v8 m=8 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 rI112 net33 X short
 rI120 VGND met5vgnd short
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index 1d9fd56..ac8ed27 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -54,18 +54,6 @@
         RECT 4.560000 -0.455000 6.675000 -0.155000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
@@ -89,6 +77,22 @@
         RECT -1.260000 0.560000 1.060000 2.160000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
index d285b9c..8c819a3 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.v
@@ -69,20 +69,12 @@
 
 `celldefine
 module sky130_fd_sc_hdll__probec_p_8 (
-    X   ,
-    A   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A
 );
 
-    output X   ;
-    input  A   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
index 2f74063..3df4204 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_hdll__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net105 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net105 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI98 net105 D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net213 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net160 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net145 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net117 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net213 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net128 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net117 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net117 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net116 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net105 D VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net105 sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net213 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net117 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net265 M1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net216 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net257 net117 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 net105 SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net117 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net268 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net241 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net105 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI642 RESET RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI676 M1 M0 net176 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net213 net117 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI675 net176 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net117 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI653 Q net213 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI677 M1 RESET net176 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M0 clkpos net160 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 net160 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 S0 clkneg net145 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net145 net117 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N net117 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net213 net117 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos net128 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net128 M1 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net117 RESET net116 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net117 S0 net116 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net116 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 net105 D p0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 net105 sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg net265 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net213 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net117 S0 net268 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net265 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net216 RESET VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net257 net117 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net257 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net117 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net268 RESET VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net241 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net105 clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg net241 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 net216 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net213 net117 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net117 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfbbp_1
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index a28a915..3a118ea 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -170,18 +170,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.152000 ;
     DIRECTION INOUT ;
@@ -238,6 +226,22 @@
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.170000 0.345000  0.345000 0.635000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
index 74d0765..6b2ca58 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.v
@@ -95,11 +95,7 @@
     SCE    ,
     CLK    ,
     SET_B  ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -110,10 +106,6 @@
     input  CLK    ;
     input  SET_B  ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
index 026834c..252d973 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net134 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net115 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net92 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI672 net171 net92 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 Q_N net171 VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net215 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net92 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net92 S0 net134 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net194 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net134 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net92 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net127 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net115 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net115 M1 net127 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg net110 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 net171 net92 VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MI652 Q net92 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 Q_N net171 VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1 sa=0.265
+MI654 net110 net92 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI649 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI672 net171 net92 VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 Q_N net171 VGND VNB nfet_01v8 m=1 w=0.52 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net215 net92 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net92 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net215 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net92 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net194 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net194 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net194 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net92 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 net171 net92 VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 Q_N net171 VPWR VPB pfet_01v8_hvt m=1 w=0.79 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index 33c9489..3e83c66 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -109,20 +109,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.450000 2.910000 ;
-        RECT  4.455000 1.305000 14.450000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880750 ;
     DIRECTION INOUT ;
@@ -132,6 +118,24 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
index b8762a3..5d6770f 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.v
@@ -91,11 +91,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -105,10 +101,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
index 82b4fe2..3a2fa32 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net134 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net115 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net92 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net103 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI672 net171 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 Q_N net171 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net215 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net92 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net92 S0 net134 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net194 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net134 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net92 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net127 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net115 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net115 M1 net127 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg net103 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 net171 net92 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI652 Q net92 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 Q_N net171 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI654 net103 net92 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI649 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI672 net171 net92 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 Q_N net171 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net215 net92 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net92 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net215 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net92 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net194 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net194 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net194 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net92 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 net171 net92 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 Q_N net171 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index c9a9e89..8250391 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -109,20 +109,6 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.910000 2.910000 ;
-        RECT  4.455000 1.305000 14.910000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.269200 ;
     DIRECTION INOUT ;
@@ -132,6 +118,24 @@
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.910000 2.910000 ;
+        RECT  4.455000 1.305000 14.910000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.720000 0.085000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
index abe35e9..57b2eb9 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.v
@@ -91,11 +91,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -105,10 +101,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
index dba8500..2054e6c 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkpos CLK_N VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 net153 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net117 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net110 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net98 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net153 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net87 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net86 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkpos CLK_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net190 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI642 clkpos CLK_N VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 net153 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 net153 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net169 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net169 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI656 net87 net153 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net87 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI657 net117 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net110 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net98 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net98 M1 net110 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 net153 clkneg net86 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net87 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI654 net86 net87 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI649 M1 clkpos net153 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkpos CLK_N VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net190 net87 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 net153 clkpos net190 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 net153 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net169 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net169 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net169 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net87 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg net153 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtn_1
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index b380d99..db16077 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.455000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
index 4b7d863..89d93e5 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.v
@@ -87,11 +87,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -100,10 +96,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
index 816beda..ec7abe6 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net84 S0 net114 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net114 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net107 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net95 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net95 M1 net107 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg net90 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI652 Q net84 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI654 net90 net84 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net84 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net84 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net187 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net166 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 63c0b2c..876e475 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.070000 2.910000 ;
-        RECT  4.455000 1.305000 13.070000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
index 16ad3c4..208ddf3 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.v
@@ -87,11 +87,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -100,10 +96,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
index b92502d..fb78cb5 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net90 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net84 S0 net114 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net114 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net107 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net95 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net95 M1 net107 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg net90 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI652 Q net84 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI654 net90 net84 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net84 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net84 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net187 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net166 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 97f9d11..dc54d7c 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -98,20 +98,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 13.530000 2.910000 ;
-        RECT  4.455000 1.305000 13.530000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.059800 ;
     DIRECTION INOUT ;
@@ -121,6 +107,24 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.530000 2.910000 ;
+        RECT  4.455000 1.305000 13.530000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
index 9450d72..d76bfb3 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.v
@@ -87,11 +87,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -100,10 +96,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
index 5f69e1c..5ace5cb 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_hdll__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net84 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net95 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 Q net84 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net83 net84 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net84 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net84 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net84 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI656 net84 S0 net114 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net166 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
+MI657 net114 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 Q net84 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI33 net107 RESET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI4 M0 clkpos net95 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 net95 M1 net107 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI655 S0 clkneg net83 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI652 Q net84 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI654 net83 net84 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
+MI647 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net84 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net84 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos net187 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net84 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg net166 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net166 RESET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 Q net84 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.54 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfrtp_4
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index 31b7375..7482b87 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -103,20 +103,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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  2.120000 1.425000 ;
-        RECT -0.190000 1.425000 14.450000 2.910000 ;
-        RECT  4.455000 1.305000 14.450000 1.425000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.264800 ;
     DIRECTION INOUT ;
@@ -126,6 +112,24 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
index bf4d3b6..79e9e65 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.v
@@ -87,11 +87,7 @@
     D      ,
     SCD    ,
     SCE    ,
-    RESET_B,
-    VPWR   ,
-    VGND   ,
-    VPB    ,
-    VNB
+    RESET_B
 );
 
     output Q      ;
@@ -100,10 +96,6 @@
     input  SCD    ;
     input  SCE    ;
     input  RESET_B;
-    input  VPWR   ;
-    input  VGND   ;
-    input  VPB    ;
-    input  VNB    ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
index 321ca7e..41bf44d 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hdll__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net159 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net159 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net159 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net138 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net138 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos net138 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI661 Q_N S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net199 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net199 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net98 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net98 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net199 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net199 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net98 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI27 net243 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI27 net243 S1 net215 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos net230 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net227 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net227 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net199 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net199 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI644 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI25 net215 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net215 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 M0 clkpos net206 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net199 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net199 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net206 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 M1 M0 net227 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net230 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI654 net206 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net230 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI26 S0 clkneg net243 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index 266a19e..a628d85 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
-  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 14.910000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.970500 ;
     DIRECTION INOUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.910000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.720000 0.085000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
index 86891de..8102737 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.v
@@ -91,11 +91,7 @@
     D    ,
     SCD  ,
     SCE  ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
@@ -105,10 +101,6 @@
     input  SCD  ;
     input  SCE  ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
index c7aff70..e48c327 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hdll__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net195 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net195 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net195 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net130 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net130 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net122 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net195 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI669 S0 clkpos net122 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net130 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net107 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net107 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net107 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI34 S0 clkpos net242 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net239 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI27 net239 S1 net187 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net223 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 M0 clkpos net223 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net242 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI656 M1 M0 net226 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net223 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net242 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI26 S0 clkneg net239 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net226 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net195 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net226 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net195 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI644 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net187 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI25 net187 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net195 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 Q net195 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index 3574b08..a6ecaca 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -114,18 +114,6 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
-  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 15.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.625500 ;
     DIRECTION INOUT ;
@@ -135,6 +123,22 @@
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
index ab92581..6d52c32 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.v
@@ -91,11 +91,7 @@
     D    ,
     SCD  ,
     SCE  ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
@@ -105,10 +101,6 @@
     input  SCD  ;
     input  SCE  ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
index d4732b7..b40b5a5 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net165 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net165 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net109 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI669 S0 clkpos net96 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net84 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 S0 clkpos net189 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI27 net209 S1 net157 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 M0 clkpos net200 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 M1 M0 net196 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net200 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI36 net189 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI26 S0 clkneg net209 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net196 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI644 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net189 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI25 net157 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net165 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net165 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net165 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_hdll__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index d17d3e7..01d07cf 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -101,18 +101,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.599700 ;
     DIRECTION INOUT ;
@@ -122,6 +110,22 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
index 62db623..2b7822c 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.v
@@ -87,11 +87,7 @@
     D    ,
     SCD  ,
     SCE  ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
@@ -100,10 +96,6 @@
     input  SCD  ;
     input  SCE  ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
index 8a23f2b..aee6c19 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net165 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net165 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net109 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI669 S0 clkpos net96 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net84 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 S0 clkpos net189 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI27 net209 S1 net157 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 M0 clkpos net200 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 M1 M0 net196 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net200 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI36 net189 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI26 S0 clkneg net209 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net196 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI644 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net189 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI25 net157 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net165 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net165 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net165 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_hdll__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index 5cfb0a6..472632f 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -103,18 +103,6 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.071800 ;
     DIRECTION INOUT ;
@@ -124,6 +112,22 @@
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 14.260000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
index 9d0d7be..b5e0590 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.v
@@ -87,11 +87,7 @@
     D    ,
     SCD  ,
     SCE  ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
@@ -100,10 +96,6 @@
     input  SCD  ;
     input  SCE  ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
index 8938e04..9d87eac 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI645 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI47 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net165 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net165 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI659 M1 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg net109 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI669 S0 clkpos net96 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI648 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 S0 clkneg net84 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI43 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI45 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI34 S0 clkpos net189 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI27 net209 S1 net157 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI647 S1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI655 M0 clkpos net200 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 M1 M0 net196 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net200 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI36 net189 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI26 S0 clkneg net209 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI42 db clkneg M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net196 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI644 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net189 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI25 net157 SET_B VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net165 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net165 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net165 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_hdll__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index e94ca6f..9d463b7 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -107,18 +107,6 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.397400 ;
     DIRECTION INOUT ;
@@ -128,6 +116,22 @@
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.370000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.180000 0.085000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
index a0d40ba..18524b6 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.v
@@ -87,11 +87,7 @@
     D    ,
     SCD  ,
     SCE  ,
-    SET_B,
-    VPWR ,
-    VGND ,
-    VPB  ,
-    VNB
+    SET_B
 );
 
     output Q    ;
@@ -100,10 +96,6 @@
     input  SCD  ;
     input  SCE  ;
     input  SET_B;
-    input  VPWR ;
-    input  VGND ;
-    input  VPB  ;
-    input  VNB  ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
index 036069f..25ba9b1 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI657 M0 clkpos net132 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net132 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net132 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI641 net120 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI642 S0 clkneg net120 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI646 Q S1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net153 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI661 Q_N net153 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net153 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 S1 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N net153 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net177 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI644 S0 clkpos net177 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 net189 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI660 Q_N net153 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net177 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI653 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net189 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net153 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index 4fe065b..a8102f5 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -97,18 +97,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.705550 ;
     DIRECTION INOUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
index c7a6019..e36dcd2 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.v
@@ -81,28 +81,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sdfxbp_1 (
-    Q   ,
-    Q_N ,
-    CLK ,
-    D   ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    Q_N,
+    CLK,
+    D  ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    output Q_N ;
-    input  CLK ;
-    input  D   ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    output Q_N;
+    input  CLK;
+    input  D  ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
index 9c79c09..c7ea537 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI657 M0 clkpos net129 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net129 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net129 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI641 net120 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI642 S0 clkneg net120 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI646 Q S1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net153 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI661 Q_N net153 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net153 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 S1 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N net153 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net177 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI644 S0 clkpos net177 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 net189 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI660 Q_N net153 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net177 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI653 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net189 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net153 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index b84b0e0..906075e 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -95,18 +95,6 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.675550 ;
     DIRECTION INOUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
index 42955fd..012912a 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.v
@@ -81,28 +81,20 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sdfxbp_2 (
-    Q   ,
-    Q_N ,
-    CLK ,
-    D   ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    Q_N,
+    CLK,
+    D  ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    output Q_N ;
-    input  CLK ;
-    input  D   ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    output Q_N;
+    input  CLK;
+    input  D  ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
index 05dc762..65af97f 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 S1 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net75 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 M0 clkpos net75 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI656 net75 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net54 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI646 Q S1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg net54 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net155 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net155 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos net122 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index 284057a..e4fdec1 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -88,18 +88,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.369900 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
index bcdadf6..694c6d5 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sdfxtp_1 (
-    Q   ,
-    CLK ,
-    D   ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    CLK,
+    D  ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    input  CLK ;
-    input  D   ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    input  CLK;
+    input  D  ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
index 958a214..25768fa 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 S1 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net75 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 M0 clkpos net75 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI656 net75 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net54 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI646 Q S1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg net54 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net138 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos net122 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 1c5bd00..fc48a02 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -88,18 +88,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.711150 ;
     DIRECTION INOUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
index 5a385ba..be79af6 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sdfxtp_2 (
-    Q   ,
-    CLK ,
-    D   ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    CLK,
+    D  ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    input  CLK ;
-    input  D   ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    input  CLK;
+    input  D  ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
index a08fafd..f53e241 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos S0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 S1 S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net78 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI639 sceb SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI657 M0 clkpos net78 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI656 net78 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net54 S1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI646 Q S1 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg net54 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D n0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE n1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net138 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos net122 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D p0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb p1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdfxtp_4
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 9ccf4b5..4dd5b49 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -92,18 +92,6 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.981150 ;
     DIRECTION INOUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
index 2afab49..bb53456 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.v
@@ -78,26 +78,18 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sdfxtp_4 (
-    Q   ,
-    CLK ,
-    D   ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    CLK,
+    D  ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    input  CLK ;
-    input  D   ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    input  CLK;
+    input  D  ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
index 2b3a7d1..17355c2 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkpos net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net76 CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net76 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI22 net68 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net116 GATE net68 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI20 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI655 M0 clkneg net123 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net68 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net123 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI24 net116 SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net112 CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net76 m1 net112 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI23 net116 GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI46 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 GCLK net76 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index 2f6c51a..33aaa6b 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.382600 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
index 394666d..b53cef0 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.v
@@ -78,21 +78,13 @@
     GCLK,
     SCE ,
     GATE,
-    CLK ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    CLK
 );
 
     output GCLK;
     input  SCE ;
     input  GATE;
     input  CLK ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
index 99d3ef8..4614966 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkpos net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net76 CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net76 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI22 net63 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net116 GATE net63 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI20 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI655 M0 clkneg net123 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net63 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net123 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI24 net116 SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net112 CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net76 m1 net112 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI23 net116 GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI46 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 GCLK net76 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 9b5b7a6..a4a4040 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -84,18 +84,6 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.665400 ;
     DIRECTION INOUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
index b595c5f..2c4c982 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.v
@@ -78,21 +78,13 @@
     GCLK,
     SCE ,
     GATE,
-    CLK ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    CLK
 );
 
     output GCLK;
     input  SCE ;
     input  GATE;
     input  CLK ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
index 70c8fe9..a660e77 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI662 net88 m1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkpos net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net76 CLK VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net76 m1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI19 m1 M0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI22 net63 SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net116 GATE net63 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net76 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net116 clkpos M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI20 m1 M0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net63 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI655 M0 clkneg net123 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net116 GATE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI654 net123 m1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI24 net116 SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 net112 CLK VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 GCLK net76 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MI656 net76 m1 net112 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI23 net116 GATE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI653 GCLK net76 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index a8a7cf3..681ebf5 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -89,18 +89,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.223500 ;
     DIRECTION INOUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
index c6e6c5e..0d58af2 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.v
@@ -78,21 +78,13 @@
     GCLK,
     SCE ,
     GATE,
-    CLK ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    CLK
 );
 
     output GCLK;
     input  SCE ;
     input  GATE;
     input  CLK ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
index 73da6be..e714998 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_hdll__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI14 net155 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 S0 clkneg net155 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net123 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 net123 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net127 q1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI644 S0 clkpos net127 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net123 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net127 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI33 net116 deneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net107 sceneg db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD net107 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net104 D net116 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net104 SCE db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI40 net87 q1 net104 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 VPWR DE net87 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI44 sceneg SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 Q_N q1 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net107 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net235 q1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI642 S0 clkneg net235 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net104 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net104 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI646 Q S0 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net87 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net224 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 M0 clkpos net224 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI43 net104 sceneg db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI18 q1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 Q_N q1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI45 sceneg SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI32 net104 D net203 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI16 net200 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net235 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI15 S0 clkpos net200 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI41 net192 q1 net104 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI39 VGND deneg net192 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net224 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI37 deneg DE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI34 net203 DE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net104 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI49 net176 SCE db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI48 VGND SCD net176 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net104 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI53 Q_N q1 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net192 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net203 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net176 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI53 Q_N q1 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sedfxbp_1
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index e679662..9edc542 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -103,20 +103,6 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
-  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.285000 1.435000 ;
-        RECT -0.190000 1.435000 15.370000 2.910000 ;
-        RECT  7.985000 1.305000 15.370000 1.435000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.935350 ;
     DIRECTION INOUT ;
@@ -126,6 +112,24 @@
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  5.285000 1.435000 ;
+        RECT -0.190000 1.435000 15.370000 2.910000 ;
+        RECT  7.985000 1.305000 15.370000 1.435000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.180000 0.085000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
index 7f2746d..76c7100 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.v
@@ -85,30 +85,22 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sedfxbp_1 (
-    Q   ,
-    Q_N ,
-    CLK ,
-    D   ,
-    DE  ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    Q_N,
+    CLK,
+    D  ,
+    DE ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    output Q_N ;
-    input  CLK ;
-    input  D   ;
-    input  DE  ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    output Q_N;
+    input  CLK;
+    input  D  ;
+    input  DE ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
index 874aae2..8bc6c45 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_hdll__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
+MI14 net155 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
 + sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI637 clkpos clkneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 S0 clkneg net155 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI645 Q S0 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net144 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI658 net144 M1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net127 q1 VPWR VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPWR VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI644 S0 clkpos net127 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg net144 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net127 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI33 net116 deneg VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net107 sceneg db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD net107 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net104 D net116 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net104 SCE db VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.75 l=0.18 mult=1 sa=0.265
+MI40 net96 q1 net104 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI38 VPWR DE net96 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
+MI44 sceneg SCE VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 Q_N q1 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI634 M1 M0 VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI636 clkpos clkneg VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net107 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI641 net240 q1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI642 S0 clkneg net240 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net104 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI648 db clkneg M0 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net104 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI646 Q S0 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net96 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI656 net224 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI657 M0 clkpos net224 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI43 net104 sceneg db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI18 q1 S0 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 Q_N q1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MI45 sceneg SCE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI32 net104 D net180 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI16 net200 M1 VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net240 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI15 S0 clkpos net200 VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI41 net192 q1 net104 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI39 VGND deneg net192 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net224 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI37 deneg DE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
+MI34 net180 DE VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net104 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI49 net171 SCE db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI48 VGND SCD net171 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net104 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI53 Q_N q1 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.36 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net192 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net180 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net171 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI53 Q_N q1 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__sedfxbp_2
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 97c9e35..1ec1486 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -105,20 +105,6 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
-  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.285000 1.435000 ;
-        RECT -0.190000 1.435000 16.750000 2.910000 ;
-        RECT  7.985000 1.305000 16.750000 1.435000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.495350 ;
     DIRECTION INOUT ;
@@ -128,6 +114,24 @@
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  5.285000 1.435000 ;
+        RECT -0.190000 1.435000 16.750000 2.910000 ;
+        RECT  7.985000 1.305000 16.750000 1.435000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
index 02681d2..31a3866 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.v
@@ -85,30 +85,22 @@
 
 `celldefine
 module sky130_fd_sc_hdll__sedfxbp_2 (
-    Q   ,
-    Q_N ,
-    CLK ,
-    D   ,
-    DE  ,
-    SCD ,
-    SCE ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Q  ,
+    Q_N,
+    CLK,
+    D  ,
+    DE ,
+    SCD,
+    SCE
 );
 
-    output Q   ;
-    output Q_N ;
-    input  CLK ;
-    input  D   ;
-    input  DE  ;
-    input  SCD ;
-    input  SCE ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Q  ;
+    output Q_N;
+    input  CLK;
+    input  D  ;
+    input  DE ;
+    input  SCD;
+    input  SCE;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
index 594a713..9dd5fdf 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
@@ -30,6 +30,338 @@
         RECT 177.780000 4.880000 180.095000 5.595000 ;
         RECT 177.780000 5.895000 180.095000 6.610000 ;
         RECT 177.980000 5.595000 180.095000 5.895000 ;
+      LAYER pwell ;
+        RECT    3.825000 0.320000    3.995000 0.845000 ;
+        RECT    7.045000 4.595000    7.215000 5.120000 ;
+        RECT    8.425000 0.320000    8.595000 0.845000 ;
+        RECT   15.325000 4.595000   15.495000 5.120000 ;
+        RECT   16.245000 0.320000   16.415000 0.845000 ;
+        RECT   19.465000 0.320000   19.635000 0.845000 ;
+        RECT   21.305000 4.595000   21.475000 5.120000 ;
+        RECT   24.985000 0.320000   25.155000 0.845000 ;
+        RECT   28.205000 4.595000   28.375000 5.120000 ;
+        RECT   33.265000 4.595000   33.435000 5.120000 ;
+        RECT   33.725000 0.320000   33.895000 0.845000 ;
+        RECT   38.325000 0.320000   38.495000 0.845000 ;
+        RECT   42.005000 4.595000   42.175000 5.120000 ;
+        RECT   42.925000 0.320000   43.095000 0.845000 ;
+        RECT   49.825000 0.320000   49.995000 0.845000 ;
+        RECT   51.665000 4.595000   51.835000 5.120000 ;
+        RECT   53.505000 0.320000   53.675000 0.845000 ;
+        RECT   58.565000 0.320000   58.735000 0.845000 ;
+        RECT   66.385000 0.320000   66.555000 0.845000 ;
+        RECT   68.685000 4.595000   68.855000 5.120000 ;
+        RECT   70.065000 0.320000   70.235000 0.845000 ;
+        RECT   74.205000 0.320000   74.375000 0.845000 ;
+        RECT   80.645000 0.320000   80.815000 0.845000 ;
+        RECT   83.405000 0.320000   83.575000 0.845000 ;
+        RECT   87.545000 0.320000   87.715000 0.845000 ;
+        RECT   87.545000 4.595000   87.715000 5.120000 ;
+        RECT   94.445000 0.320000   94.615000 0.845000 ;
+        RECT   94.445000 4.595000   94.615000 5.120000 ;
+        RECT   98.585000 0.320000   98.755000 0.845000 ;
+        RECT  105.025000 0.320000  105.195000 0.845000 ;
+        RECT  106.865000 4.595000  107.035000 5.120000 ;
+        RECT  116.065000 0.320000  116.235000 0.845000 ;
+        RECT  120.665000 0.320000  120.835000 0.845000 ;
+        RECT  122.965000 4.595000  123.135000 5.120000 ;
+        RECT  124.805000 0.320000  124.975000 0.845000 ;
+        RECT  129.405000 0.320000  129.575000 0.845000 ;
+        RECT  135.845000 4.595000  136.015000 5.120000 ;
+        RECT  136.765000 0.320000  136.935000 0.845000 ;
+        RECT  140.445000 0.320000  140.615000 0.845000 ;
+        RECT  145.965000 0.320000  146.135000 0.845000 ;
+        RECT  152.405000 4.595000  152.575000 5.120000 ;
+        RECT  155.165000 0.320000  155.335000 0.845000 ;
+        RECT  158.845000 4.595000  159.015000 5.120000 ;
+        RECT  159.765000 0.320000  159.935000 0.845000 ;
+        RECT  164.825000 0.320000  164.995000 0.845000 ;
+        RECT  166.205000 4.595000  166.375000 5.120000 ;
+        RECT  166.665000 4.595000  166.835000 5.120000 ;
+        RECT  173.105000 0.320000  173.275000 0.845000 ;
+        RECT  173.105000 4.595000  173.275000 5.120000 ;
+        RECT  177.245000 0.320000  177.415000 0.845000 ;
+        RECT  179.545000 4.595000  179.715000 5.120000 ;
+        RECT  183.685000 0.320000  183.855000 0.845000 ;
+        RECT  186.445000 4.595000  186.615000 5.120000 ;
+        RECT  193.345000 4.595000  193.515000 5.120000 ;
+        RECT  194.725000 0.320000  194.895000 0.845000 ;
+        RECT  198.405000 0.320000  198.575000 0.845000 ;
+        RECT  200.705000 4.595000  200.875000 5.120000 ;
+        RECT  202.545000 0.320000  202.715000 0.845000 ;
+        RECT  208.065000 4.595000  208.235000 5.120000 ;
+        RECT  209.905000 0.320000  210.075000 0.845000 ;
+        RECT  213.125000 0.320000  213.295000 0.845000 ;
+        RECT  216.345000 4.595000  216.515000 5.120000 ;
+        RECT  218.645000 0.320000  218.815000 0.845000 ;
+        RECT  224.625000 4.595000  224.795000 5.120000 ;
+        RECT  227.845000 0.320000  228.015000 0.845000 ;
+        RECT  232.445000 0.320000  232.615000 0.845000 ;
+        RECT  234.285000 4.595000  234.455000 5.120000 ;
+        RECT  237.505000 0.320000  237.675000 0.845000 ;
+        RECT  246.245000 0.320000  246.415000 0.845000 ;
+        RECT  249.925000 0.320000  250.095000 0.845000 ;
+        RECT  256.825000 0.320000  256.995000 0.845000 ;
+        RECT  268.785000 0.320000  268.955000 0.845000 ;
+        RECT  271.545000 0.320000  271.715000 0.845000 ;
+        RECT  274.765000 0.320000  274.935000 0.845000 ;
+        RECT  278.905000 0.320000  279.075000 0.845000 ;
+        RECT  282.585000 0.320000  282.755000 0.845000 ;
+        RECT  286.725000 0.320000  286.895000 0.845000 ;
+        RECT  291.325000 0.320000  291.495000 0.845000 ;
+        RECT  294.545000 0.320000  294.715000 0.845000 ;
+        RECT  298.225000 0.320000  298.395000 0.845000 ;
+        RECT  303.285000 0.320000  303.455000 0.845000 ;
+        RECT  307.425000 0.320000  307.595000 0.845000 ;
+        RECT  312.025000 0.320000  312.195000 0.845000 ;
+        RECT  317.545000 0.320000  317.715000 0.845000 ;
+        RECT  321.225000 0.320000  321.395000 0.845000 ;
+        RECT  325.365000 0.320000  325.535000 0.845000 ;
+        RECT  330.425000 0.320000  330.595000 0.845000 ;
+        RECT  335.025000 0.320000  335.195000 0.845000 ;
+        RECT  340.085000 0.320000  340.255000 0.845000 ;
+        RECT  345.605000 0.320000  345.775000 0.845000 ;
+        RECT  350.665000 0.320000  350.835000 0.845000 ;
+        RECT  356.185000 0.320000  356.355000 0.845000 ;
+        RECT  363.085000 0.320000  363.255000 0.845000 ;
+        RECT  365.385000 0.320000  365.555000 0.845000 ;
+        RECT  374.125000 0.320000  374.295000 0.845000 ;
+        RECT  386.085000 0.320000  386.255000 0.845000 ;
+        RECT  388.845000 0.320000  389.015000 0.845000 ;
+        RECT  392.525000 0.320000  392.695000 0.845000 ;
+        RECT  397.585000 0.320000  397.755000 0.845000 ;
+        RECT  404.025000 0.320000  404.195000 0.845000 ;
+        RECT  417.825000 0.320000  417.995000 0.845000 ;
+        RECT  425.645000 0.320000  425.815000 0.845000 ;
+        RECT  438.525000 0.320000  438.695000 0.845000 ;
+        RECT  445.885000 0.320000  446.055000 0.845000 ;
+        RECT  448.185000 0.320000  448.355000 0.845000 ;
+        RECT  458.765000 0.320000  458.935000 0.845000 ;
+        RECT  461.525000 0.320000  461.695000 0.845000 ;
+        RECT  465.205000 0.320000  465.375000 0.845000 ;
+        RECT  471.185000 0.320000  471.355000 0.845000 ;
+        RECT  473.485000 0.320000  473.655000 0.845000 ;
+        RECT  486.365000 0.320000  486.535000 0.845000 ;
+        RECT  489.125000 0.320000  489.295000 0.845000 ;
+        RECT  493.265000 0.320000  493.435000 0.845000 ;
+        RECT  500.165000 0.320000  500.335000 0.845000 ;
+        RECT  502.465000 0.320000  502.635000 0.845000 ;
+        RECT  505.685000 0.320000  505.855000 0.845000 ;
+        RECT  507.525000 0.320000  507.695000 0.845000 ;
+        RECT  517.645000 0.320000  517.815000 0.845000 ;
+        RECT  528.225000 0.320000  528.395000 0.845000 ;
+        RECT  540.185000 0.320000  540.355000 0.845000 ;
+        RECT  550.765000 0.320000  550.935000 0.845000 ;
+        RECT  561.805000 0.320000  561.975000 0.845000 ;
+        RECT  574.225000 0.320000  574.395000 0.845000 ;
+        RECT  580.665000 0.320000  580.835000 0.845000 ;
+        RECT  587.565000 0.320000  587.735000 0.845000 ;
+        RECT  595.385000 0.320000  595.555000 0.845000 ;
+        RECT  599.065000 0.320000  599.235000 0.845000 ;
+        RECT  602.745000 0.320000  602.915000 0.845000 ;
+        RECT  606.885000 0.320000  607.055000 0.845000 ;
+        RECT  611.025000 0.320000  611.195000 0.845000 ;
+        RECT  616.085000 0.320000  616.255000 0.845000 ;
+        RECT  622.985000 0.320000  623.155000 0.845000 ;
+        RECT  634.485000 0.320000  634.655000 0.845000 ;
+        RECT  637.705000 0.320000  637.875000 0.845000 ;
+        RECT  641.845000 0.320000  642.015000 0.845000 ;
+        RECT  647.825000 0.320000  647.995000 0.845000 ;
+        RECT  657.485000 0.320000  657.655000 0.845000 ;
+        RECT  660.705000 0.320000  660.875000 0.845000 ;
+        RECT  664.845000 0.320000  665.015000 0.845000 ;
+        RECT  670.825000 0.320000  670.995000 0.845000 ;
+        RECT  680.485000 0.320000  680.655000 0.845000 ;
+        RECT  682.325000 0.320000  682.495000 0.845000 ;
+        RECT  689.225000 0.320000  689.395000 0.845000 ;
+        RECT  697.965000 0.320000  698.135000 0.845000 ;
+        RECT  700.265000 0.320000  700.435000 0.845000 ;
+        RECT  703.485000 0.320000  703.655000 0.845000 ;
+        RECT  707.625000 0.320000  707.795000 0.845000 ;
+        RECT  712.685000 0.320000  712.855000 0.845000 ;
+        RECT  717.745000 0.320000  717.915000 0.845000 ;
+        RECT  722.805000 0.320000  722.975000 0.845000 ;
+        RECT  729.245000 0.320000  729.415000 0.845000 ;
+        RECT  740.285000 0.320000  740.455000 0.845000 ;
+        RECT  744.885000 0.320000  745.055000 0.845000 ;
+        RECT  750.865000 0.320000  751.035000 0.845000 ;
+        RECT  760.525000 0.320000  760.695000 0.845000 ;
+        RECT  762.825000 0.320000  762.995000 0.845000 ;
+        RECT  766.045000 0.320000  766.215000 0.845000 ;
+        RECT  771.105000 0.320000  771.275000 0.845000 ;
+        RECT  779.845000 0.320000  780.015000 0.845000 ;
+        RECT  782.605000 0.320000  782.775000 0.845000 ;
+        RECT  786.285000 0.320000  786.455000 0.845000 ;
+        RECT  792.265000 0.320000  792.435000 0.845000 ;
+        RECT  795.025000 0.320000  795.195000 0.845000 ;
+        RECT  799.625000 0.320000  799.795000 0.845000 ;
+        RECT  806.985000 0.320000  807.155000 0.845000 ;
+        RECT  810.205000 0.320000  810.375000 0.845000 ;
+        RECT  815.265000 0.320000  815.435000 0.845000 ;
+        RECT  823.545000 0.320000  823.715000 0.845000 ;
+        RECT  826.765000 0.320000  826.935000 0.845000 ;
+        RECT  832.285000 0.320000  832.455000 0.845000 ;
+        RECT  841.485000 0.320000  841.655000 0.845000 ;
+        RECT  845.165000 0.320000  845.335000 0.845000 ;
+        RECT  851.605000 0.320000  851.775000 0.845000 ;
+        RECT  861.725000 0.320000  861.895000 0.845000 ;
+        RECT  866.325000 0.320000  866.495000 0.845000 ;
+        RECT  873.225000 0.320000  873.395000 0.845000 ;
+        RECT  884.265000 0.320000  884.435000 0.845000 ;
+        RECT  886.565000 0.320000  886.735000 0.845000 ;
+        RECT  889.785000 0.320000  889.955000 0.845000 ;
+        RECT  894.845000 0.320000  895.015000 0.845000 ;
+        RECT  903.585000 0.320000  903.755000 0.845000 ;
+        RECT  906.345000 0.320000  906.515000 0.845000 ;
+        RECT  910.485000 0.320000  910.655000 0.845000 ;
+        RECT  916.465000 0.320000  916.635000 0.845000 ;
+        RECT  919.225000 0.320000  919.395000 0.845000 ;
+        RECT  923.825000 0.320000  923.995000 0.845000 ;
+        RECT  930.725000 0.320000  930.895000 0.845000 ;
+        RECT  933.945000 0.320000  934.115000 0.845000 ;
+        RECT  939.465000 0.320000  939.635000 0.845000 ;
+        RECT  947.285000 0.320000  947.455000 0.845000 ;
+        RECT  950.505000 0.320000  950.675000 0.845000 ;
+        RECT  956.025000 0.320000  956.195000 0.845000 ;
+        RECT  965.225000 0.320000  965.395000 0.845000 ;
+        RECT  969.365000 0.320000  969.535000 0.845000 ;
+        RECT  975.805000 0.320000  975.975000 0.845000 ;
+        RECT  985.925000 0.320000  986.095000 0.845000 ;
+        RECT  990.525000 0.320000  990.695000 0.845000 ;
+        RECT  997.425000 0.320000  997.595000 0.845000 ;
+        RECT 1008.005000 0.320000 1008.175000 0.845000 ;
+        RECT 1012.605000 0.320000 1012.775000 0.845000 ;
+        RECT 1017.205000 0.320000 1017.375000 0.845000 ;
+        RECT 1024.565000 0.320000 1024.735000 0.845000 ;
+        RECT 1027.785000 0.320000 1027.955000 0.845000 ;
+        RECT 1033.305000 0.320000 1033.475000 0.845000 ;
+        RECT 1042.505000 0.320000 1042.675000 0.845000 ;
+        RECT 1046.185000 0.320000 1046.355000 0.845000 ;
+        RECT 1050.325000 0.320000 1050.495000 0.845000 ;
+        RECT 1056.765000 0.320000 1056.935000 0.845000 ;
+        RECT 1059.525000 0.320000 1059.695000 0.845000 ;
+        RECT 1063.665000 0.320000 1063.835000 0.845000 ;
+        RECT 1070.565000 0.320000 1070.735000 0.845000 ;
+        RECT 1074.705000 0.320000 1074.875000 0.845000 ;
+        RECT 1079.305000 0.320000 1079.475000 0.845000 ;
+        RECT 1086.205000 0.320000 1086.375000 0.845000 ;
+        RECT 1089.885000 0.320000 1090.055000 0.845000 ;
+        RECT 1094.945000 0.320000 1095.115000 0.845000 ;
+        RECT 1102.765000 0.320000 1102.935000 0.845000 ;
+        RECT 1107.365000 0.320000 1107.535000 0.845000 ;
+        RECT 1112.425000 0.320000 1112.595000 0.845000 ;
+        RECT 1120.705000 0.320000 1120.875000 0.845000 ;
+        RECT 1124.845000 0.320000 1125.015000 0.845000 ;
+        RECT 1131.285000 0.320000 1131.455000 0.845000 ;
+        RECT 1142.325000 0.320000 1142.495000 0.845000 ;
+        RECT 1146.465000 0.320000 1146.635000 0.845000 ;
+        RECT 1151.065000 0.320000 1151.235000 0.845000 ;
+        RECT 1158.425000 0.320000 1158.595000 0.845000 ;
+        RECT 1161.645000 0.320000 1161.815000 0.845000 ;
+        RECT 1167.165000 0.320000 1167.335000 0.845000 ;
+        RECT 1175.905000 0.320000 1176.075000 0.845000 ;
+        RECT 1180.505000 0.320000 1180.675000 0.845000 ;
+        RECT 1185.565000 0.320000 1185.735000 0.845000 ;
+        RECT 1193.845000 0.320000 1194.015000 0.845000 ;
+        RECT 1197.985000 0.320000 1198.155000 0.845000 ;
+        RECT 1204.425000 0.320000 1204.595000 0.845000 ;
+        RECT 1215.925000 0.320000 1216.095000 0.845000 ;
+        RECT 1219.145000 0.320000 1219.315000 0.845000 ;
+        RECT 1224.665000 0.320000 1224.835000 0.845000 ;
+        RECT 1233.865000 0.320000 1234.035000 0.845000 ;
+        RECT 1237.545000 0.320000 1237.715000 0.845000 ;
+        RECT 1244.445000 0.320000 1244.615000 0.845000 ;
+        RECT 1255.945000 0.320000 1256.115000 0.845000 ;
+        RECT 1258.705000 0.320000 1258.875000 0.845000 ;
+        RECT 1261.925000 0.320000 1262.095000 0.845000 ;
+        RECT 1266.065000 0.320000 1266.235000 0.845000 ;
+        RECT 1269.745000 0.320000 1269.915000 0.845000 ;
+        RECT 1273.885000 0.320000 1274.055000 0.845000 ;
+        RECT 1278.945000 0.320000 1279.115000 0.845000 ;
+        RECT 1282.165000 0.320000 1282.335000 0.845000 ;
+        RECT 1285.845000 0.320000 1286.015000 0.845000 ;
+        RECT 1290.905000 0.320000 1291.075000 0.845000 ;
+        RECT 1295.045000 0.320000 1295.215000 0.845000 ;
+        RECT 1299.185000 0.320000 1299.355000 0.845000 ;
+        RECT 1304.245000 0.320000 1304.415000 0.845000 ;
+        RECT 1307.925000 0.320000 1308.095000 0.845000 ;
+        RECT 1312.065000 0.320000 1312.235000 0.845000 ;
+        RECT 1317.125000 0.320000 1317.295000 0.845000 ;
+        RECT 1321.725000 0.320000 1321.895000 0.845000 ;
+        RECT 1326.325000 0.320000 1326.495000 0.845000 ;
+        RECT 1332.305000 0.320000 1332.475000 0.845000 ;
+        RECT 1337.365000 0.320000 1337.535000 0.845000 ;
+        RECT 1342.885000 0.320000 1343.055000 0.845000 ;
+        RECT 1349.325000 0.320000 1349.495000 0.845000 ;
+        RECT 1365.425000 0.320000 1365.595000 0.845000 ;
+        RECT 1380.145000 0.320000 1380.315000 0.845000 ;
+        RECT 1395.325000 0.320000 1395.495000 0.845000 ;
+        RECT 1408.665000 0.320000 1408.835000 0.845000 ;
+        RECT 1422.005000 0.320000 1422.175000 0.845000 ;
+        RECT 1435.805000 0.320000 1435.975000 0.845000 ;
+        RECT 1450.985000 0.320000 1451.155000 0.845000 ;
+        RECT 1467.085000 0.320000 1467.255000 0.845000 ;
+        RECT 1480.885000 0.320000 1481.055000 0.845000 ;
+        RECT 1495.605000 0.320000 1495.775000 0.845000 ;
+        RECT 1511.245000 0.320000 1511.415000 0.845000 ;
+        RECT 1523.665000 0.320000 1523.835000 0.845000 ;
+        RECT 1537.465000 0.320000 1537.635000 0.845000 ;
+        RECT 1548.505000 0.320000 1548.675000 0.845000 ;
+        RECT 1560.005000 0.320000 1560.175000 0.845000 ;
+        RECT 1572.425000 0.320000 1572.595000 0.845000 ;
+        RECT 1580.245000 0.320000 1580.415000 0.845000 ;
+        RECT 1588.525000 0.320000 1588.695000 0.845000 ;
+        RECT 1598.185000 0.320000 1598.355000 0.845000 ;
+        RECT 1613.825000 0.320000 1613.995000 0.845000 ;
+        RECT 1630.845000 0.320000 1631.015000 0.845000 ;
+        RECT 1634.985000 0.320000 1635.155000 0.845000 ;
+        RECT 1641.885000 0.320000 1642.055000 0.845000 ;
+        RECT 1653.385000 0.320000 1653.555000 0.845000 ;
+        RECT 1663.045000 0.320000 1663.215000 0.845000 ;
+        RECT 1673.165000 0.320000 1673.335000 0.845000 ;
+        RECT 1684.205000 0.320000 1684.375000 0.845000 ;
+        RECT 1688.345000 0.320000 1688.515000 0.845000 ;
+        RECT 1695.245000 0.320000 1695.415000 0.845000 ;
+        RECT 1706.745000 0.320000 1706.915000 0.845000 ;
+        RECT 1716.865000 0.320000 1717.035000 0.845000 ;
+        RECT 1726.985000 0.320000 1727.155000 0.845000 ;
+        RECT 1738.025000 0.320000 1738.195000 0.845000 ;
+        RECT 1752.745000 0.320000 1752.915000 0.845000 ;
+        RECT 1755.505000 0.320000 1755.675000 0.845000 ;
+        RECT 1759.185000 0.320000 1759.355000 0.845000 ;
+        RECT 1762.865000 0.320000 1763.035000 0.845000 ;
+        RECT 1765.625000 0.320000 1765.795000 0.845000 ;
+        RECT 1768.385000 0.320000 1768.555000 0.845000 ;
+        RECT 1772.525000 0.320000 1772.695000 0.845000 ;
+        RECT 1778.505000 0.320000 1778.675000 0.845000 ;
+        RECT 1788.625000 0.320000 1788.795000 0.845000 ;
+        RECT 1807.485000 0.320000 1807.655000 0.845000 ;
+        RECT 1809.325000 0.320000 1809.495000 0.845000 ;
+        RECT 1811.625000 0.320000 1811.795000 0.845000 ;
+        RECT 1814.845000 0.320000 1815.015000 0.845000 ;
+        RECT 1818.985000 0.320000 1819.155000 0.845000 ;
+        RECT 1824.965000 0.320000 1825.135000 0.845000 ;
+        RECT 1832.325000 0.320000 1832.495000 0.845000 ;
+        RECT 1832.785000 0.320000 1832.955000 0.845000 ;
+        RECT 1841.985000 0.320000 1842.155000 0.845000 ;
+        RECT 1855.325000 0.320000 1855.495000 0.845000 ;
+        RECT 1881.545000 0.320000 1881.715000 0.845000 ;
+        RECT 1899.025000 0.320000 1899.195000 0.845000 ;
+        RECT 1925.245000 0.320000 1925.415000 0.845000 ;
+        RECT 1930.305000 0.320000 1930.475000 0.845000 ;
+        RECT 1935.825000 0.320000 1935.995000 0.845000 ;
+        RECT 1942.265000 0.320000 1942.435000 0.845000 ;
+        RECT 1942.265000 4.595000 1942.435000 5.120000 ;
+        RECT 1967.565000 0.320000 1967.735000 0.845000 ;
+        RECT 1967.565000 4.595000 1967.735000 5.120000 ;
+        RECT 1985.045000 0.320000 1985.215000 0.845000 ;
+        RECT 1985.045000 4.595000 1985.215000 5.120000 ;
+        RECT 2011.265000 0.320000 2011.435000 0.845000 ;
+        RECT 2011.265000 4.595000 2011.435000 5.120000 ;
+        RECT 2037.485000 0.320000 2037.655000 0.845000 ;
+        RECT 2037.485000 4.595000 2037.655000 5.120000 ;
+        RECT 2063.705000 0.320000 2063.875000 0.845000 ;
+        RECT 2063.705000 4.595000 2063.875000 5.120000 ;
     END
   END VGND
   PIN VPWR
@@ -39,6 +371,25 @@
         RECT 177.780000 1.550000 180.095000 2.265000 ;
         RECT 177.780000 2.565000 180.095000 3.280000 ;
         RECT 177.980000 2.265000 180.095000 2.565000 ;
+      LAYER nwell ;
+        RECT   -0.190000 1.305000 1367.860000 1.425000 ;
+        RECT   -0.190000 1.425000 1603.785000 1.435000 ;
+        RECT   -0.190000 1.435000 2064.210000 2.910000 ;
+        RECT   -0.190000 2.910000  234.790000 3.370000 ;
+        RECT   -0.190000 3.370000  228.350000 4.135000 ;
+        RECT  229.810000 3.370000  231.110000 4.135000 ;
+        RECT  233.490000 3.370000  234.790000 4.135000 ;
+        RECT 1343.010000 1.285000 1349.370000 1.305000 ;
+        RECT 1370.195000 1.305000 1382.580000 1.425000 ;
+        RECT 1384.915000 1.305000 1397.760000 1.425000 ;
+        RECT 1400.095000 1.305000 1411.100000 1.425000 ;
+        RECT 1413.435000 1.305000 1424.440000 1.425000 ;
+        RECT 1426.775000 1.305000 1603.785000 1.425000 ;
+        RECT 1606.485000 1.305000 1619.425000 1.435000 ;
+        RECT 1622.125000 1.305000 1740.460000 1.425000 ;
+        RECT 1622.125000 1.425000 2064.210000 1.435000 ;
+        RECT 1742.795000 1.305000 2064.210000 1.425000 ;
+        RECT 1941.930000 2.910000 2064.210000 4.135000 ;
     END
   END VPWR
   OBS
@@ -26491,6 +26842,396 @@
       RECT 174.580000 1.615000 176.180000 6.545000 ;
       RECT 177.780000 2.365000 177.880000 2.465000 ;
       RECT 177.780000 5.695000 177.880000 5.795000 ;
+    LAYER pwell ;
+      RECT    0.135000 -0.085000    0.305000 0.085000 ;
+      RECT    0.145000  5.355000    0.315000 5.525000 ;
+      RECT    4.290000 -0.085000    4.460000 0.085000 ;
+      RECT    7.505000  5.355000    7.675000 5.525000 ;
+      RECT    8.885000 -0.085000    9.055000 0.085000 ;
+      RECT   15.785000  5.355000   15.955000 5.525000 ;
+      RECT   16.705000 -0.085000   16.875000 0.085000 ;
+      RECT   19.905000 -0.085000   20.075000 0.085000 ;
+      RECT   21.765000  5.355000   21.935000 5.525000 ;
+      RECT   25.450000 -0.085000   25.620000 0.085000 ;
+      RECT   28.665000  5.355000   28.835000 5.525000 ;
+      RECT   33.725000  5.355000   33.895000 5.525000 ;
+      RECT   34.185000 -0.085000   34.355000 0.085000 ;
+      RECT   38.790000 -0.085000   38.960000 0.085000 ;
+      RECT   42.470000  5.355000   42.640000 5.525000 ;
+      RECT   43.385000 -0.085000   43.555000 0.085000 ;
+      RECT   50.285000 -0.085000   50.455000 0.085000 ;
+      RECT   52.130000  5.355000   52.300000 5.525000 ;
+      RECT   53.970000 -0.085000   54.140000 0.085000 ;
+      RECT   59.025000 -0.085000   59.195000 0.085000 ;
+      RECT   66.845000 -0.085000   67.015000 0.085000 ;
+      RECT   69.150000  5.355000   69.320000 5.525000 ;
+      RECT   70.530000 -0.085000   70.700000 0.085000 ;
+      RECT   74.665000 -0.085000   74.835000 0.085000 ;
+      RECT   81.105000 -0.085000   81.275000 0.085000 ;
+      RECT   83.865000 -0.085000   84.035000 0.085000 ;
+      RECT   88.010000 -0.085000   88.180000 0.085000 ;
+      RECT   88.010000  5.355000   88.180000 5.525000 ;
+      RECT   94.905000 -0.085000   95.075000 0.085000 ;
+      RECT   94.905000  5.355000   95.075000 5.525000 ;
+      RECT   99.050000 -0.085000   99.220000 0.085000 ;
+      RECT  105.490000 -0.085000  105.660000 0.085000 ;
+      RECT  107.325000  5.355000  107.495000 5.525000 ;
+      RECT  116.530000 -0.085000  116.700000 0.085000 ;
+      RECT  121.125000 -0.085000  121.295000 0.085000 ;
+      RECT  123.430000  5.355000  123.600000 5.525000 ;
+      RECT  125.270000 -0.085000  125.440000 0.085000 ;
+      RECT  129.865000 -0.085000  130.035000 0.085000 ;
+      RECT  136.310000  5.355000  136.480000 5.525000 ;
+      RECT  137.230000 -0.085000  137.400000 0.085000 ;
+      RECT  140.910000 -0.085000  141.080000 0.085000 ;
+      RECT  146.430000 -0.085000  146.600000 0.085000 ;
+      RECT  152.870000  5.355000  153.040000 5.525000 ;
+      RECT  155.630000 -0.085000  155.800000 0.085000 ;
+      RECT  159.310000  5.355000  159.480000 5.525000 ;
+      RECT  160.205000 -0.085000  160.375000 0.085000 ;
+      RECT  165.290000 -0.085000  165.460000 0.085000 ;
+      RECT  167.130000  5.355000  167.300000 5.525000 ;
+      RECT  173.565000 -0.085000  173.735000 0.085000 ;
+      RECT  173.570000  5.355000  173.740000 5.525000 ;
+      RECT  177.705000 -0.085000  177.875000 0.085000 ;
+      RECT  180.005000  5.355000  180.175000 5.525000 ;
+      RECT  184.150000 -0.085000  184.320000 0.085000 ;
+      RECT  186.905000  5.355000  187.075000 5.525000 ;
+      RECT  193.805000  5.355000  193.975000 5.525000 ;
+      RECT  195.190000 -0.085000  195.360000 0.085000 ;
+      RECT  198.870000 -0.085000  199.040000 0.085000 ;
+      RECT  201.165000  5.355000  201.335000 5.525000 ;
+      RECT  203.010000 -0.085000  203.180000 0.085000 ;
+      RECT  208.525000  5.355000  208.695000 5.525000 ;
+      RECT  210.370000 -0.085000  210.540000 0.085000 ;
+      RECT  213.590000 -0.085000  213.760000 0.085000 ;
+      RECT  216.805000  5.355000  216.975000 5.525000 ;
+      RECT  219.110000 -0.085000  219.280000 0.085000 ;
+      RECT  225.085000  5.355000  225.255000 5.525000 ;
+      RECT  226.005000  5.355000  226.175000 5.525000 ;
+      RECT  227.845000  5.355000  228.015000 5.525000 ;
+      RECT  228.310000 -0.085000  228.480000 0.085000 ;
+      RECT  230.605000  5.355000  230.775000 5.525000 ;
+      RECT  232.910000 -0.085000  233.080000 0.085000 ;
+      RECT  237.970000 -0.085000  238.140000 0.085000 ;
+      RECT  246.705000 -0.085000  246.875000 0.085000 ;
+      RECT  250.390000 -0.085000  250.560000 0.085000 ;
+      RECT  257.290000 -0.085000  257.460000 0.085000 ;
+      RECT  269.245000 -0.085000  269.415000 0.085000 ;
+      RECT  272.005000 -0.085000  272.175000 0.085000 ;
+      RECT  275.225000 -0.085000  275.395000 0.085000 ;
+      RECT  279.365000 -0.085000  279.535000 0.085000 ;
+      RECT  283.050000 -0.085000  283.220000 0.085000 ;
+      RECT  287.185000 -0.085000  287.355000 0.085000 ;
+      RECT  291.785000 -0.085000  291.955000 0.085000 ;
+      RECT  295.005000 -0.085000  295.175000 0.085000 ;
+      RECT  298.685000 -0.085000  298.855000 0.085000 ;
+      RECT  303.750000 -0.085000  303.920000 0.085000 ;
+      RECT  307.885000 -0.085000  308.055000 0.085000 ;
+      RECT  312.485000 -0.085000  312.655000 0.085000 ;
+      RECT  318.005000 -0.085000  318.175000 0.085000 ;
+      RECT  321.690000 -0.085000  321.860000 0.085000 ;
+      RECT  325.830000 -0.085000  326.000000 0.085000 ;
+      RECT  330.885000 -0.085000  331.055000 0.085000 ;
+      RECT  335.490000 -0.085000  335.660000 0.085000 ;
+      RECT  340.550000 -0.085000  340.720000 0.085000 ;
+      RECT  346.065000 -0.085000  346.235000 0.085000 ;
+      RECT  351.130000 -0.085000  351.300000 0.085000 ;
+      RECT  356.650000 -0.085000  356.820000 0.085000 ;
+      RECT  363.555000 -0.085000  363.725000 0.085000 ;
+      RECT  366.320000 -0.085000  366.490000 0.085000 ;
+      RECT  374.590000 -0.085000  374.760000 0.085000 ;
+      RECT  386.545000 -0.085000  386.715000 0.085000 ;
+      RECT  389.310000 -0.085000  389.480000 0.085000 ;
+      RECT  392.990000 -0.085000  393.160000 0.085000 ;
+      RECT  398.050000 -0.085000  398.220000 0.085000 ;
+      RECT  404.490000 -0.085000  404.660000 0.085000 ;
+      RECT  418.290000 -0.085000  418.460000 0.085000 ;
+      RECT  426.110000 -0.085000  426.280000 0.085000 ;
+      RECT  438.990000 -0.085000  439.160000 0.085000 ;
+      RECT  447.365000 -0.085000  447.535000 0.085000 ;
+      RECT  448.645000 -0.085000  448.815000 0.085000 ;
+      RECT  459.230000 -0.085000  459.400000 0.085000 ;
+      RECT  461.985000 -0.085000  462.155000 0.085000 ;
+      RECT  465.665000 -0.085000  465.835000 0.085000 ;
+      RECT  471.645000 -0.085000  471.815000 0.085000 ;
+      RECT  473.945000 -0.085000  474.115000 0.085000 ;
+      RECT  486.825000 -0.085000  486.995000 0.085000 ;
+      RECT  489.585000 -0.085000  489.755000 0.085000 ;
+      RECT  493.730000 -0.085000  493.900000 0.085000 ;
+      RECT  500.625000 -0.085000  500.795000 0.085000 ;
+      RECT  502.925000 -0.085000  503.095000 0.085000 ;
+      RECT  506.145000 -0.085000  506.315000 0.085000 ;
+      RECT  507.985000 -0.085000  508.155000 0.085000 ;
+      RECT  518.105000 -0.085000  518.275000 0.085000 ;
+      RECT  528.685000 -0.085000  528.855000 0.085000 ;
+      RECT  540.645000 -0.085000  540.815000 0.085000 ;
+      RECT  551.225000 -0.085000  551.395000 0.085000 ;
+      RECT  562.265000 -0.085000  562.435000 0.085000 ;
+      RECT  574.690000 -0.085000  574.860000 0.085000 ;
+      RECT  581.130000 -0.085000  581.300000 0.085000 ;
+      RECT  588.025000 -0.085000  588.195000 0.085000 ;
+      RECT  595.840000 -0.085000  596.010000 0.085000 ;
+      RECT  599.520000 -0.085000  599.690000 0.085000 ;
+      RECT  603.200000 -0.085000  603.370000 0.085000 ;
+      RECT  607.350000 -0.085000  607.520000 0.085000 ;
+      RECT  611.490000 -0.085000  611.660000 0.085000 ;
+      RECT  616.550000 -0.085000  616.720000 0.085000 ;
+      RECT  623.445000 -0.085000  623.615000 0.085000 ;
+      RECT  634.945000 -0.085000  635.115000 0.085000 ;
+      RECT  638.165000 -0.085000  638.335000 0.085000 ;
+      RECT  642.310000 -0.085000  642.480000 0.085000 ;
+      RECT  648.290000 -0.085000  648.460000 0.085000 ;
+      RECT  657.950000 -0.085000  658.120000 0.085000 ;
+      RECT  661.170000 -0.085000  661.340000 0.085000 ;
+      RECT  665.310000 -0.085000  665.480000 0.085000 ;
+      RECT  671.290000 -0.085000  671.460000 0.085000 ;
+      RECT  680.945000 -0.085000  681.115000 0.085000 ;
+      RECT  682.785000 -0.085000  682.955000 0.085000 ;
+      RECT  689.685000 -0.085000  689.855000 0.085000 ;
+      RECT  698.425000 -0.085000  698.595000 0.085000 ;
+      RECT  700.725000 -0.085000  700.895000 0.085000 ;
+      RECT  703.945000 -0.085000  704.115000 0.085000 ;
+      RECT  708.085000 -0.085000  708.255000 0.085000 ;
+      RECT  713.420000 -0.085000  713.640000 0.085000 ;
+      RECT  718.210000 -0.085000  718.380000 0.085000 ;
+      RECT  723.270000 -0.085000  723.440000 0.085000 ;
+      RECT  729.710000 -0.085000  729.880000 0.085000 ;
+      RECT  740.745000 -0.085000  740.915000 0.085000 ;
+      RECT  745.350000 -0.085000  745.520000 0.085000 ;
+      RECT  751.330000 -0.085000  751.500000 0.085000 ;
+      RECT  760.980000 -0.085000  761.150000 0.085000 ;
+      RECT  763.290000 -0.085000  763.460000 0.085000 ;
+      RECT  766.510000 -0.085000  766.680000 0.085000 ;
+      RECT  771.570000 -0.085000  771.740000 0.085000 ;
+      RECT  780.310000 -0.085000  780.480000 0.085000 ;
+      RECT  783.070000 -0.085000  783.240000 0.085000 ;
+      RECT  786.750000 -0.085000  786.920000 0.085000 ;
+      RECT  792.730000 -0.085000  792.900000 0.085000 ;
+      RECT  795.490000 -0.085000  795.660000 0.085000 ;
+      RECT  800.090000 -0.085000  800.260000 0.085000 ;
+      RECT  807.445000 -0.085000  807.615000 0.085000 ;
+      RECT  810.670000 -0.085000  810.840000 0.085000 ;
+      RECT  815.730000 -0.085000  815.900000 0.085000 ;
+      RECT  824.010000 -0.085000  824.180000 0.085000 ;
+      RECT  827.230000 -0.085000  827.400000 0.085000 ;
+      RECT  832.750000 -0.085000  832.920000 0.085000 ;
+      RECT  841.945000 -0.085000  842.115000 0.085000 ;
+      RECT  845.630000 -0.085000  845.800000 0.085000 ;
+      RECT  852.070000 -0.085000  852.240000 0.085000 ;
+      RECT  862.185000 -0.085000  862.355000 0.085000 ;
+      RECT  866.785000 -0.085000  866.955000 0.085000 ;
+      RECT  873.685000 -0.085000  873.855000 0.085000 ;
+      RECT  884.730000 -0.085000  884.900000 0.085000 ;
+      RECT  887.030000 -0.085000  887.200000 0.085000 ;
+      RECT  890.250000 -0.085000  890.420000 0.085000 ;
+      RECT  895.305000 -0.085000  895.475000 0.085000 ;
+      RECT  904.045000 -0.085000  904.215000 0.085000 ;
+      RECT  906.810000 -0.085000  906.980000 0.085000 ;
+      RECT  910.950000 -0.085000  911.120000 0.085000 ;
+      RECT  916.930000 -0.085000  917.100000 0.085000 ;
+      RECT  919.690000 -0.085000  919.860000 0.085000 ;
+      RECT  924.290000 -0.085000  924.460000 0.085000 ;
+      RECT  931.185000 -0.085000  931.355000 0.085000 ;
+      RECT  934.410000 -0.085000  934.580000 0.085000 ;
+      RECT  939.930000 -0.085000  940.100000 0.085000 ;
+      RECT  947.745000 -0.085000  947.915000 0.085000 ;
+      RECT  950.970000 -0.085000  951.140000 0.085000 ;
+      RECT  956.490000 -0.085000  956.660000 0.085000 ;
+      RECT  965.685000 -0.085000  965.855000 0.085000 ;
+      RECT  969.825000 -0.085000  969.995000 0.085000 ;
+      RECT  976.265000 -0.085000  976.435000 0.085000 ;
+      RECT  986.390000 -0.085000  986.560000 0.085000 ;
+      RECT  990.985000 -0.085000  991.155000 0.085000 ;
+      RECT  997.890000 -0.085000  998.060000 0.085000 ;
+      RECT 1008.470000 -0.085000 1008.640000 0.085000 ;
+      RECT 1013.070000 -0.085000 1013.240000 0.085000 ;
+      RECT 1017.665000 -0.085000 1017.835000 0.085000 ;
+      RECT 1025.025000 -0.085000 1025.195000 0.085000 ;
+      RECT 1028.245000 -0.085000 1028.415000 0.085000 ;
+      RECT 1033.770000 -0.085000 1033.940000 0.085000 ;
+      RECT 1042.965000 -0.085000 1043.135000 0.085000 ;
+      RECT 1046.650000 -0.085000 1046.820000 0.085000 ;
+      RECT 1050.790000 -0.085000 1050.960000 0.085000 ;
+      RECT 1057.230000 -0.085000 1057.400000 0.085000 ;
+      RECT 1059.980000 -0.085000 1060.150000 0.085000 ;
+      RECT 1064.125000 -0.085000 1064.295000 0.085000 ;
+      RECT 1071.025000 -0.085000 1071.195000 0.085000 ;
+      RECT 1075.165000 -0.085000 1075.335000 0.085000 ;
+      RECT 1079.765000 -0.085000 1079.935000 0.085000 ;
+      RECT 1086.665000 -0.085000 1086.835000 0.085000 ;
+      RECT 1090.345000 -0.085000 1090.515000 0.085000 ;
+      RECT 1095.405000 -0.085000 1095.575000 0.085000 ;
+      RECT 1103.225000 -0.085000 1103.395000 0.085000 ;
+      RECT 1107.800000 -0.085000 1107.970000 0.085000 ;
+      RECT 1112.890000 -0.085000 1113.060000 0.085000 ;
+      RECT 1121.165000 -0.085000 1121.335000 0.085000 ;
+      RECT 1125.305000 -0.085000 1125.475000 0.085000 ;
+      RECT 1131.750000 -0.085000 1131.920000 0.085000 ;
+      RECT 1142.785000 -0.085000 1142.955000 0.085000 ;
+      RECT 1146.910000 -0.085000 1147.080000 0.085000 ;
+      RECT 1151.525000 -0.085000 1151.695000 0.085000 ;
+      RECT 1158.885000 -0.085000 1159.055000 0.085000 ;
+      RECT 1162.110000 -0.085000 1162.280000 0.085000 ;
+      RECT 1167.625000 -0.085000 1167.795000 0.085000 ;
+      RECT 1176.370000 -0.085000 1176.540000 0.085000 ;
+      RECT 1180.955000 -0.085000 1181.125000 0.085000 ;
+      RECT 1186.025000 -0.085000 1186.195000 0.085000 ;
+      RECT 1194.305000 -0.085000 1194.475000 0.085000 ;
+      RECT 1198.450000 -0.085000 1198.620000 0.085000 ;
+      RECT 1204.875000 -0.085000 1205.045000 0.085000 ;
+      RECT 1216.390000 -0.085000 1216.560000 0.085000 ;
+      RECT 1219.610000 -0.085000 1219.780000 0.085000 ;
+      RECT 1225.125000 -0.085000 1225.295000 0.085000 ;
+      RECT 1234.330000 -0.085000 1234.500000 0.085000 ;
+      RECT 1238.005000 -0.085000 1238.175000 0.085000 ;
+      RECT 1244.910000 -0.085000 1245.080000 0.085000 ;
+      RECT 1256.405000 -0.085000 1256.575000 0.085000 ;
+      RECT 1259.170000 -0.085000 1259.340000 0.085000 ;
+      RECT 1262.390000 -0.085000 1262.560000 0.085000 ;
+      RECT 1266.530000 -0.085000 1266.700000 0.085000 ;
+      RECT 1270.205000 -0.085000 1270.375000 0.085000 ;
+      RECT 1274.345000 -0.085000 1274.515000 0.085000 ;
+      RECT 1279.400000 -0.085000 1279.570000 0.085000 ;
+      RECT 1282.625000 -0.085000 1282.795000 0.085000 ;
+      RECT 1286.310000 -0.085000 1286.480000 0.085000 ;
+      RECT 1291.365000 -0.085000 1291.535000 0.085000 ;
+      RECT 1295.505000 -0.085000 1295.675000 0.085000 ;
+      RECT 1299.650000 -0.085000 1299.820000 0.085000 ;
+      RECT 1304.710000 -0.085000 1304.880000 0.085000 ;
+      RECT 1308.390000 -0.085000 1308.560000 0.085000 ;
+      RECT 1312.520000 -0.085000 1312.690000 0.085000 ;
+      RECT 1317.590000 -0.085000 1317.760000 0.085000 ;
+      RECT 1322.190000 -0.085000 1322.360000 0.085000 ;
+      RECT 1326.785000 -0.085000 1326.955000 0.085000 ;
+      RECT 1332.765000 -0.085000 1332.935000 0.085000 ;
+      RECT 1337.830000 -0.085000 1338.000000 0.085000 ;
+      RECT 1343.345000 -0.085000 1343.515000 0.085000 ;
+      RECT 1349.785000 -0.085000 1349.955000 0.085000 ;
+      RECT 1365.955000 -0.010000 1365.975000 0.015000 ;
+      RECT 1380.675000 -0.010000 1380.695000 0.015000 ;
+      RECT 1395.855000 -0.010000 1395.875000 0.015000 ;
+      RECT 1409.195000 -0.010000 1409.215000 0.015000 ;
+      RECT 1422.535000 -0.010000 1422.555000 0.015000 ;
+      RECT 1436.270000 -0.085000 1436.440000 0.085000 ;
+      RECT 1451.450000 -0.085000 1451.620000 0.085000 ;
+      RECT 1467.545000 -0.085000 1467.715000 0.085000 ;
+      RECT 1481.345000 -0.085000 1481.515000 0.085000 ;
+      RECT 1496.065000 -0.085000 1496.235000 0.085000 ;
+      RECT 1511.705000 -0.085000 1511.875000 0.085000 ;
+      RECT 1524.125000 -0.085000 1524.295000 0.085000 ;
+      RECT 1537.925000 -0.085000 1538.095000 0.085000 ;
+      RECT 1548.965000 -0.085000 1549.135000 0.085000 ;
+      RECT 1560.465000 -0.085000 1560.635000 0.085000 ;
+      RECT 1572.890000 -0.085000 1573.060000 0.085000 ;
+      RECT 1580.710000 -0.085000 1580.880000 0.085000 ;
+      RECT 1588.990000 -0.085000 1589.160000 0.085000 ;
+      RECT 1598.645000 -0.085000 1598.815000 0.085000 ;
+      RECT 1614.285000 -0.085000 1614.455000 0.085000 ;
+      RECT 1631.305000 -0.085000 1631.475000 0.085000 ;
+      RECT 1635.445000 -0.085000 1635.615000 0.085000 ;
+      RECT 1642.345000 -0.085000 1642.515000 0.085000 ;
+      RECT 1653.845000 -0.085000 1654.015000 0.085000 ;
+      RECT 1663.510000 -0.085000 1663.680000 0.085000 ;
+      RECT 1673.625000 -0.085000 1673.795000 0.085000 ;
+      RECT 1684.665000 -0.085000 1684.835000 0.085000 ;
+      RECT 1688.805000 -0.085000 1688.975000 0.085000 ;
+      RECT 1695.705000 -0.085000 1695.875000 0.085000 ;
+      RECT 1707.205000 -0.085000 1707.375000 0.085000 ;
+      RECT 1717.325000 -0.085000 1717.495000 0.085000 ;
+      RECT 1727.535000 -0.085000 1727.705000 0.085000 ;
+      RECT 1738.555000 -0.010000 1738.575000 0.015000 ;
+      RECT 1753.205000 -0.085000 1753.375000 0.085000 ;
+      RECT 1755.965000 -0.085000 1756.135000 0.085000 ;
+      RECT 1759.650000 -0.085000 1759.820000 0.085000 ;
+      RECT 1763.325000 -0.085000 1763.495000 0.085000 ;
+      RECT 1766.085000 -0.085000 1766.255000 0.085000 ;
+      RECT 1768.850000 -0.085000 1769.020000 0.085000 ;
+      RECT 1772.990000 -0.085000 1773.160000 0.085000 ;
+      RECT 1778.965000 -0.085000 1779.135000 0.085000 ;
+      RECT 1789.085000 -0.085000 1789.255000 0.085000 ;
+      RECT 1807.945000 -0.085000 1808.115000 0.085000 ;
+      RECT 1809.785000 -0.085000 1809.955000 0.085000 ;
+      RECT 1812.085000 -0.085000 1812.255000 0.085000 ;
+      RECT 1815.305000 -0.085000 1815.475000 0.085000 ;
+      RECT 1819.445000 -0.085000 1819.615000 0.085000 ;
+      RECT 1825.420000 -0.055000 1825.540000 0.055000 ;
+      RECT 1825.895000 -0.050000 1826.055000 0.060000 ;
+      RECT 1826.835000 -0.060000 1826.945000 0.060000 ;
+      RECT 1828.630000 -0.120000 1828.850000 0.050000 ;
+      RECT 1833.245000 -0.085000 1833.415000 0.085000 ;
+      RECT 1842.445000 -0.085000 1842.615000 0.085000 ;
+      RECT 1848.425000 -0.085000 1848.595000 0.085000 ;
+      RECT 1848.885000 -0.085000 1849.055000 0.085000 ;
+      RECT 1854.865000 -0.085000 1855.035000 0.085000 ;
+      RECT 1855.785000 -0.085000 1855.955000 0.085000 ;
+      RECT 1868.205000 -0.085000 1868.375000 0.085000 ;
+      RECT 1868.665000 -0.085000 1868.835000 0.085000 ;
+      RECT 1881.085000 -0.085000 1881.255000 0.085000 ;
+      RECT 1882.005000 -0.085000 1882.175000 0.085000 ;
+      RECT 1886.145000 -0.085000 1886.315000 0.085000 ;
+      RECT 1890.285000 -0.085000 1890.455000 0.085000 ;
+      RECT 1894.425000 -0.085000 1894.595000 0.085000 ;
+      RECT 1898.565000 -0.085000 1898.735000 0.085000 ;
+      RECT 1899.485000 -0.085000 1899.655000 0.085000 ;
+      RECT 1905.465000 -0.085000 1905.635000 0.085000 ;
+      RECT 1905.925000 -0.085000 1906.095000 0.085000 ;
+      RECT 1911.905000 -0.085000 1912.075000 0.085000 ;
+      RECT 1912.365000 -0.085000 1912.535000 0.085000 ;
+      RECT 1918.345000 -0.085000 1918.515000 0.085000 ;
+      RECT 1918.805000 -0.085000 1918.975000 0.085000 ;
+      RECT 1924.785000 -0.085000 1924.955000 0.085000 ;
+      RECT 1925.980000 -0.085000 1926.200000 0.085000 ;
+      RECT 1931.500000 -0.085000 1931.720000 0.085000 ;
+      RECT 1937.940000 -0.085000 1938.160000 0.085000 ;
+      RECT 1942.725000 -0.085000 1942.895000 0.085000 ;
+      RECT 1942.725000  5.355000 1942.895000 5.525000 ;
+      RECT 1948.705000 -0.085000 1948.875000 0.085000 ;
+      RECT 1948.705000  5.355000 1948.875000 5.525000 ;
+      RECT 1961.125000 -0.085000 1961.295000 0.085000 ;
+      RECT 1961.125000  5.355000 1961.295000 5.525000 ;
+      RECT 1968.025000 -0.085000 1968.195000 0.085000 ;
+      RECT 1968.025000  5.355000 1968.195000 5.525000 ;
+      RECT 1972.165000 -0.085000 1972.335000 0.085000 ;
+      RECT 1972.165000  5.355000 1972.335000 5.525000 ;
+      RECT 1976.305000 -0.085000 1976.475000 0.085000 ;
+      RECT 1976.305000  5.355000 1976.475000 5.525000 ;
+      RECT 1980.445000 -0.085000 1980.615000 0.085000 ;
+      RECT 1980.445000  5.355000 1980.615000 5.525000 ;
+      RECT 1984.585000 -0.085000 1984.755000 0.085000 ;
+      RECT 1984.585000  5.355000 1984.755000 5.525000 ;
+      RECT 1985.505000 -0.085000 1985.675000 0.085000 ;
+      RECT 1985.505000  5.355000 1985.675000 5.525000 ;
+      RECT 1991.485000 -0.085000 1991.655000 0.085000 ;
+      RECT 1991.485000  5.355000 1991.655000 5.525000 ;
+      RECT 1991.945000 -0.085000 1992.115000 0.085000 ;
+      RECT 1991.945000  5.355000 1992.115000 5.525000 ;
+      RECT 1997.925000 -0.085000 1998.095000 0.085000 ;
+      RECT 1997.925000  5.355000 1998.095000 5.525000 ;
+      RECT 1998.385000 -0.085000 1998.555000 0.085000 ;
+      RECT 1998.385000  5.355000 1998.555000 5.525000 ;
+      RECT 2004.365000 -0.085000 2004.535000 0.085000 ;
+      RECT 2004.365000  5.355000 2004.535000 5.525000 ;
+      RECT 2004.825000 -0.085000 2004.995000 0.085000 ;
+      RECT 2004.825000  5.355000 2004.995000 5.525000 ;
+      RECT 2010.805000 -0.085000 2010.975000 0.085000 ;
+      RECT 2010.805000  5.355000 2010.975000 5.525000 ;
+      RECT 2011.725000 -0.085000 2011.895000 0.085000 ;
+      RECT 2011.725000  5.355000 2011.895000 5.525000 ;
+      RECT 2024.145000 -0.085000 2024.315000 0.085000 ;
+      RECT 2024.145000  5.355000 2024.315000 5.525000 ;
+      RECT 2024.605000 -0.085000 2024.775000 0.085000 ;
+      RECT 2024.605000  5.355000 2024.775000 5.525000 ;
+      RECT 2037.025000 -0.085000 2037.195000 0.085000 ;
+      RECT 2037.025000  5.355000 2037.195000 5.525000 ;
+      RECT 2037.945000 -0.085000 2038.115000 0.085000 ;
+      RECT 2037.945000  5.355000 2038.115000 5.525000 ;
+      RECT 2050.365000 -0.085000 2050.535000 0.085000 ;
+      RECT 2050.365000  5.355000 2050.535000 5.525000 ;
+      RECT 2050.825000 -0.085000 2050.995000 0.085000 ;
+      RECT 2050.825000  5.355000 2050.995000 5.525000 ;
+      RECT 2063.245000 -0.085000 2063.415000 0.085000 ;
+      RECT 2063.245000  5.355000 2063.415000 5.525000 ;
     LAYER via ;
       RECT 156.215000 4.120000 156.475000 4.380000 ;
       RECT 156.535000 4.120000 156.795000 4.380000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index bc39e99..79d0ec8 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
@@ -38,20 +38,6 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    ANTENNADIFFAREA  0.089250 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.265000 0.375000 0.810000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-    END
-  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
@@ -60,6 +46,26 @@
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 0.265000 0.375000 0.810000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 1.470000 0.375000 2.455000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 0.460000 0.085000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.v b/cells/tap/sky130_fd_sc_hdll__tap_1.v
index 727320d..36ecf51 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.v
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__tap_1 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__tap_1 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
index 973d7ff..704ae2c 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
@@ -30,21 +30,28 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.085000 2.095000 0.375000 2.325000 ;
-    END
-  END VPB
   PIN VGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.085000 2.095000 0.375000 2.325000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
index ddb98ff..4a01bc2 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.v
@@ -63,18 +63,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__tapvgnd_1 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__tapvgnd_1 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
index 46f43b2..1a9069b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
@@ -30,21 +30,28 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VPB
-    ANTENNADIFFAREA  0.148750 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.085000 1.755000 0.375000 1.985000 ;
-    END
-  END VPB
   PIN VGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.085000 1.755000 0.375000 1.985000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
index 5d66e6e..46313ee 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.v
@@ -63,18 +63,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__tapvgnd2_1 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__tapvgnd2_1 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index 78b7d4e..1ced09e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -37,6 +37,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
+      LAYER pwell ;
+        RECT 0.145000 0.320000 0.315000 0.845000 ;
     END
   END VGND
   PIN VPWR
@@ -46,6 +48,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
     END
   END VPWR
   OBS
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
index bd92bb2..3ebc6e8 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.v
@@ -62,18 +62,7 @@
 /*********************************************************/
 
 `celldefine
-module sky130_fd_sc_hdll__tapvpwrvgnd_1 (
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
-);
-
-    input VPWR;
-    input VGND;
-    input VPB ;
-    input VNB ;
-
+module sky130_fd_sc_hdll__tapvpwrvgnd_1 ();
     // Voltage supply signals
     supply1 VPWR;
     supply0 VGND;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
index 2c52b19..d30a3bd 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_1 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A sndNA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B Y VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 5b96794..a7abb70 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 3.355000 0.825000 3.595000 1.755000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
index c15c5dc..cdd1b40 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor2_1 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
index 450053f..7bc41d8 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A sndNA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B Y VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index 87a79b0..3d0ef62 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 5.950000 0.475000 6.340000 1.415000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
index c038d91..088a50a 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor2_2 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
index 06bdf88..d9e175c 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A sndNA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand nmid VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMPnand0 inand A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B Y VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 6818dd7..5467825 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  2.320000 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 10.705000 0.905000 10.940000 1.445000 ;
     END
   END Y
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
index 408719d..434e8cb 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor2_4 (
-    Y   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    Y,
+    A,
+    B
 );
 
-    output Y   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output Y;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
index 0c8cda3..97d3274 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN3 X net57 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 mid1 Cb net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI2 mid2 C net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net57 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_1
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index c16d96b..9265f9d 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.225950 ;
     DIRECTION INOUT ;
@@ -98,6 +86,22 @@
         RECT 0.085000 1.440000 0.365000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
index 31d1853..67d1ac5 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor3_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
index b9e518a..1840cf5 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN3 X net57 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 mid1 Cb net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI2 mid2 C net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net57 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_2
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index 300eebc..1981a7d 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.220950 ;
     DIRECTION INOUT ;
@@ -97,6 +85,22 @@
         RECT 0.545000 0.350000 0.865000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
index 495fe80..593a27c 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor3_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
index b33eec5..9d46007 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xnor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIN3 X net57 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI649 mid1 Cb net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI2 mid2 C net57 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X net57 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 mid1 C net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xnor3_4
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index c29b5e6..072d3a7 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.500950 ;
     DIRECTION INOUT ;
@@ -103,6 +91,22 @@
         RECT 1.565000 1.440000 1.895000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
index bc2ba45..c673699 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.v
@@ -75,24 +75,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xnor3_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
index e6da1ad..c7a18e6 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_1 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND A sndNA VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNA B X VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 X inor VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A sndPA VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor pmid VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 8c8f2ed..c243d42 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -60,18 +60,6 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
@@ -93,6 +81,22 @@
         RECT 3.225000 1.535000 3.545000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.v b/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
index 8097e8e..20a4f3a 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor2_1 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
index 512711d..67c7650 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor B VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND A sndNA VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNA B X VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 X inor VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A sndPA VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor pmid VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index 4bc0370..a0f0f59 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -65,18 +65,6 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  0.925000 ;
     DIRECTION INOUT ;
@@ -100,6 +88,22 @@
         RECT 5.985000 0.905000 6.350000 1.415000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.v b/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
index 5fec481..3601028 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor2_2 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl b/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
index 17cac13..551eee4 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNnor1 inor B VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND A sndNA VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNA B X VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MMNaoi20 X inor VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A sndPA VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B inor VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor pmid VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index 8d4cb26..93a1df8 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
@@ -94,6 +82,22 @@
         RECT 8.705000 0.695000 8.995000 0.780000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.v b/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
index 46e361e..f6a6a8d 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.v
@@ -74,22 +74,14 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor2_4 (
-    X   ,
-    A   ,
-    B   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
index ccd695c..5face72 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP3 X net117 VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI650 mid1 Cb net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 mid1 C net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_1
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index 6335e55..67d263c 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.309400 ;
     DIRECTION INOUT ;
@@ -99,6 +87,22 @@
         RECT 0.085000 1.440000 0.610000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.v b/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
index a11896a..c017748 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor3_1 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
index b74f54f..09f4317 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP3 X net117 VPWR VPB pfet_01v8_hvt m=2 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI650 mid1 Cb net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VGND VNB nfet_01v8 m=2 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 mid1 C net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_2
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index 42705aa..b478b09 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
-  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 VPWR
     ANTENNADIFFAREA  1.269400 ;
     DIRECTION INOUT ;
@@ -101,6 +89,22 @@
         RECT 0.680000 0.350000 0.930000 0.660000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.v b/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
index 536492e..ee4aae3 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor3_2 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl b/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
index e437a62..0976483 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hdll__xor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
+MMIP3 X net117 VPWR VPB pfet_01v8_hvt m=4 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI650 mid1 Cb net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 mid2 C net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI33 Cb C VPWR VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
+MI45 Ab A VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI47 Abb Ab VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI19 mid1 Bb Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
+MI16 Bb B VPWR VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
+MI23 mid1 B Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
+MI26 mid2 Bb Abb VPB pfet_01v8_hvt m=1 w=0.64 l=0.18 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B Ab VPB pfet_01v8_hvt m=1 w=0.84 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VGND VNB nfet_01v8 m=4 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VGND VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 mid1 C net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 mid2 Cb net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 Ab A VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 Abb Ab VGND VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VGND VNB nfet_01v8 m=1 w=0.65 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Ab B mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Abb Bb mid1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb mid2 VNB nfet_01v8 m=1 w=0.6 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hdll__xor3_4
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 1d639a9..ece0301 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  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.770000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.490800 ;
     DIRECTION INOUT ;
@@ -104,6 +92,22 @@
         RECT 1.685000 2.045000 1.855000 2.465000 ;
     END
   END X
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.235000 -0.085000 0.405000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.v b/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
index acfbe57..d0e59c4 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.v
@@ -77,24 +77,16 @@
 
 `celldefine
 module sky130_fd_sc_hdll__xor3_4 (
-    X   ,
-    A   ,
-    B   ,
-    C   ,
-    VPWR,
-    VGND,
-    VPB ,
-    VNB
+    X,
+    A,
+    B,
+    C
 );
 
-    output X   ;
-    input  A   ;
-    input  B   ;
-    input  C   ;
-    input  VPWR;
-    input  VGND;
-    input  VPB ;
-    input  VNB ;
+    output X;
+    input  A;
+    input  B;
+    input  C;
 
     // Voltage supply signals
     supply1 VPWR;