diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o_1.cdl b/cells/a21o/sky130_fd_sc_hvl__a21o_1.cdl
index 4859dba..241f1e4 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMINX X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o_1.netlist.tsv b/cells/a21o/sky130_fd_sc_hvl__a21o_1.netlist.tsv
index f51fb31..e41325a 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o_1.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__a21o_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o_1.spice b/cells/a21o/sky130_fd_sc_hvl__a21o_1.spice
index 334e0b8..8f867c4 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o_1.spice
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_83_283# B1 VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=8.5875e+11p ps=5.29e+06u
-M1001 VGND a_83_283# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1002 VPWR a_83_283# X VPB phv w=1.5e+06u l=500000u
-+  ad=8.475e+11p pd=7.13e+06u as=3.975e+11p ps=3.53e+06u
-M1003 VPWR A1 a_469_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.175e+11p ps=7.09e+06u
-M1004 a_469_443# B1 a_83_283# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.275e+11p ps=3.57e+06u
-M1005 a_469_443# A2 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_631_107# A1 a_83_283# VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1007 VGND A2 a_631_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_469_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_83_283# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 X a_83_283# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_631_107# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 VGND B1 a_83_283# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 a_83_283# B1 a_469_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_83_283# A1 a_631_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_469_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.cdl
index a3a8b2d..64eaf95 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.netlist.tsv b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.netlist.tsv
index bdbd6ca..4512a98 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__a21oi_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.spice b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.spice
index e490c5a..2fc80b8 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.spice
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_271_107# A2 VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=4.125e+11p ps=4.1e+06u
-M1001 Y B1 a_56_443# VPB phv w=1.5e+06u l=500000u
-+  ad=5.475e+11p pd=3.73e+06u as=8.475e+11p ps=7.13e+06u
-M1002 VGND B1 Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.26e+06u
-M1003 VPWR A2 a_56_443# VPB phv w=1.5e+06u l=500000u
-+  ad=7.5e+11p pd=4e+06u as=0p ps=0u
-M1004 Y A1 a_271_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_56_443# A1 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 VGND A2 a_271_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_56_443# A2 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_271_107# A1 Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_56_443# B1 Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VPWR A1 a_56_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o_1.cdl b/cells/a22o/sky130_fd_sc_hvl__a22o_1.cdl
index d6122b9..0794e1c 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 y A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o_1.netlist.tsv b/cells/a22o/sky130_fd_sc_hvl__a22o_1.netlist.tsv
index 59e6a60..fc3c246 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o_1.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__a22o_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o_1.spice b/cells/a22o/sky130_fd_sc_hvl__a22o_1.spice
index d2d9426..25d087e 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o_1.spice
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_83_81# B2 a_316_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=1.485e+12p ps=1.098e+07u
-M1001 a_83_81# B1 a_519_107# VNB nhv w=750000u l=500000u
-+  ad=2.2875e+11p pd=2.11e+06u as=1.575e+11p ps=1.92e+06u
-M1002 a_519_107# B2 VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.09875e+12p ps=5.93e+06u
-M1003 VPWR A1 a_316_443# VPB phv w=1.5e+06u l=500000u
-+  ad=8.475e+11p pd=7.13e+06u as=0p ps=0u
-M1004 a_316_443# B1 a_83_81# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_316_443# A2 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_822_107# A1 a_83_81# VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1007 VGND A2 a_822_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_83_81# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1009 VPWR a_83_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.275e+11p ps=3.57e+06u
+X0 X a_83_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_822_107# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_316_443# B2 a_83_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 X a_83_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_316_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VGND B2 a_519_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 a_519_107# B1 a_83_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_83_81# A1 a_822_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 a_83_81# B1 a_316_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 VPWR A2 a_316_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.cdl
index bd2d89e..2d76d7c 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB1 Y B2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 Y B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 sndA1 A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 sndB1 B2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.netlist.tsv b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.netlist.tsv
index d2a2be5..aa3fb67 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__a22oi_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	pndA	A1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.spice b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.spice
index 93a6da7..5f4b6dd 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.spice
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_33_443# A2 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=1.275e+12p pd=1.07e+07u as=4.2e+11p ps=3.56e+06u
-M1001 a_502_107# A1 Y VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=2.1e+11p ps=2.06e+06u
-M1002 VGND A2 a_502_107# VNB nhv w=750000u l=500000u
-+  ad=4.275e+11p pd=4.14e+06u as=0p ps=0u
-M1003 a_204_107# B2 VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1004 Y B2 a_33_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=0p ps=0u
-M1005 Y B1 a_204_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_33_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_33_443# B1 Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B2 a_204_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_33_443# B2 Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 a_502_107# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_204_107# B1 Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 Y B1 a_33_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 Y A1 a_502_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VPWR A2 a_33_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 a_33_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_hvl__and2_1.cdl b/cells/and2/sky130_fd_sc_hvl__and2_1.cdl
index 32001cf..b6d3a86 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_hvl__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv 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
-MMP1 y B VPB phv 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
-MMIP0 X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nhv 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
-MMN1 sndA B VNB nhv 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
-MMIN0 X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 y A VPB pfet_g5v0d10v5 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
+MMP1 y B VPB pfet_g5v0d10v5 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
+MMIP0 X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_g5v0d10v5 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
+MMN1 sndA B VNB nfet_g5v0d10v5 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
+MMIN0 X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__and2_1
diff --git a/cells/and2/sky130_fd_sc_hvl__and2_1.netlist.tsv b/cells/and2/sky130_fd_sc_hvl__and2_1.netlist.tsv
index ebee031..54d835a 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2_1.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_hvl__and2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__and2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	y	A	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_hvl__and2_1.spice b/cells/and2/sky130_fd_sc_hvl__and2_1.spice
index 299ab60..e760077 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2_1.spice
+++ b/cells/and2/sky130_fd_sc_hvl__and2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__and2_1 A B VGND VNB VPB VPWR X
-M1000 X a_30_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=7.509e+11p ps=5.41e+06u
-M1001 a_30_107# A VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1002 X a_30_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=4.3845e+11p ps=3.14e+06u
-M1003 VPWR B a_30_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B a_183_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 a_183_107# A a_30_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_30_107# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 VPWR a_30_107# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 a_30_107# A a_183_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_183_107# B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 VPWR A a_30_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 a_30_107# B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_hvl__and3_1.cdl b/cells/and3/sky130_fd_sc_hvl__and3_1.cdl
index 85dea22..610040c 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_hvl__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv 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
-MMP1 y B VPB phv 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
-MMP2 y C VPB phv 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
-MMIP0 X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nhv 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
-MMN1 sndA B VNB nhv 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
-MMN2 sndB C VNB nhv 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
-MMIN0 X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 y A VPB pfet_g5v0d10v5 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
+MMP1 y B VPB pfet_g5v0d10v5 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
+MMP2 y C VPB pfet_g5v0d10v5 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
+MMIP0 X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_g5v0d10v5 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
+MMN1 sndA B VNB nfet_g5v0d10v5 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
+MMN2 sndB C VNB nfet_g5v0d10v5 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
+MMIN0 X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__and3_1
diff --git a/cells/and3/sky130_fd_sc_hvl__and3_1.netlist.tsv b/cells/and3/sky130_fd_sc_hvl__and3_1.netlist.tsv
index bb886ef..021474d 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3_1.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_hvl__and3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__and3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	y	A	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_hvl__and3_1.spice b/cells/and3/sky130_fd_sc_hvl__and3_1.spice
index 39248ac..a93662c 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3_1.spice
+++ b/cells/and3/sky130_fd_sc_hvl__and3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__and3_1 A B C VGND VNB VPB VPWR X
-M1000 a_30_517# B VPWR VPB phv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=5.913e+11p ps=5.19e+06u
-M1001 X a_30_517# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=3.0405e+11p ps=2.5e+06u
-M1002 a_201_173# A a_30_517# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.302e+11p ps=1.46e+06u
-M1003 a_343_173# B a_201_173# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VGND C a_343_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_30_517# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1006 VPWR C a_30_517# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_30_517# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_30_517# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_201_173# B a_343_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_30_517# C VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X3 VPWR a_30_517# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_30_517# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 VPWR B a_30_517# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 a_30_517# A a_201_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_343_173# C VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_1.cdl b/cells/buf/sky130_fd_sc_hvl__buf_1.cdl
index c04a1ff..7292f6d 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv 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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=1 w=0.75 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 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 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_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=1 w=0.75 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 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_1
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_1.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_1.netlist.tsv
index 91852f1..9bd44fb 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_1.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_1	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_1.spice b/cells/buf/sky130_fd_sc_hvl__buf_1.spice
index 53d52c7..f33ea04 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_1.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_1 A VGND VNB VPB VPWR X
-M1000 VPWR a_84_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=5.1e+11p pd=3.79e+06u as=4.275e+11p ps=3.57e+06u
-M1001 VGND a_84_81# X VNB nhv w=750000u l=500000u
-+  ad=3.0405e+11p pd=2.5e+06u as=1.9875e+11p ps=2.03e+06u
-M1002 a_84_81# A VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_84_81# A VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
+X0 VPWR A a_84_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X1 X a_84_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 VGND A a_84_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 X a_84_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_16.cdl b/cells/buf/sky130_fd_sc_hvl__buf_16.cdl
index 3ee0d0e..6f21c57 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=6 w=0.75 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 nhv m=16 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=6 w=1.5 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 VPB phv m=16 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=6 w=0.75 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_g5v0d10v5 m=16 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=6 w=1.5 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 VPB pfet_g5v0d10v5 m=16 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_16
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_16.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_16.netlist.tsv
index b11628a..5af9b80 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_16.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_16	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	6	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	16	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	6	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	16	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	6	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	16	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	6	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	16	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_16.spice b/cells/buf/sky130_fd_sc_hvl__buf_16.spice
index bcfecf7..160d378 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_16.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_16.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_16 A VGND VNB VPB VPWR X
-M1000 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=4.995e+12p pd=4.266e+07u as=1.26e+12p ps=1.068e+07u
-M1001 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.36e+12p pd=2.848e+07u as=0p ps=0u
-M1002 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=2.4975e+12p pd=2.466e+07u as=1.68e+12p ps=1.648e+07u
-M1003 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=6.3e+11p ps=6.18e+06u
-M1007 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X10 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X13 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X16 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X20 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X22 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X23 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X24 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X25 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X26 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X27 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X28 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X29 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X30 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X31 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X32 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X33 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X34 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X35 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X36 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X37 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X38 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X39 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X40 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X41 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X42 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X43 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_2.cdl b/cells/buf/sky130_fd_sc_hvl__buf_2.cdl
index 3ba10fd..6f121a9 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv 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 nhv m=2 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=1 w=0.75 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 VPB phv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 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_g5v0d10v5 m=2 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=1 w=0.75 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 VPB pfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_2
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_2.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_2.netlist.tsv
index 723707a..5911e92 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_2.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_2	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	2	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	2	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_2.spice b/cells/buf/sky130_fd_sc_hvl__buf_2.spice
index 0219c70..01dc78b 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_2.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_2 A VGND VNB VPB VPWR X
-M1000 a_129_279# A VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=1.01625e+12p ps=7.57e+06u
-M1001 X a_129_279# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=0p ps=0u
-M1002 X a_129_279# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=5.178e+11p ps=4.57e+06u
-M1003 VPWR a_129_279# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_129_279# A VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VGND a_129_279# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_129_279# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X1 VPWR a_129_279# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 X a_129_279# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VGND A a_129_279# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 X a_129_279# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VGND a_129_279# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_32.cdl b/cells/buf/sky130_fd_sc_hvl__buf_32.cdl
index 3661e2b..973fef9 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_32.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_32.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__buf_32 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nhv m=10 w=0.75 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 nhv m=32 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=10 w=1.5 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 VPB phv m=32 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=10 w=0.75 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_g5v0d10v5 m=32 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=10 w=1.5 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 VPB pfet_g5v0d10v5 m=32 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_32
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_32.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_32.netlist.tsv
index 3f7badc..9ba182e 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_32.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_32.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_32	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	10	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	32	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	10	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	32	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	10	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	32	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	10	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	32	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_32.spice b/cells/buf/sky130_fd_sc_hvl__buf_32.spice
index a79c3e3..1dfda9b 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_32.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_32.spice
@@ -16,172 +16,88 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_32 A VGND VNB VPB VPWR X
-M1000 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=9.555e+12p pd=7.874e+07u as=2.1e+12p ps=1.78e+07u
-M1001 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=3.36e+12p pd=3.296e+07u as=4.7775e+12p ps=4.574e+07u
-M1003 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=6.72e+12p ps=5.696e+07u
-M1005 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.05e+12p ps=1.03e+07u
-M1009 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 VPWR A a_183_141# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_183_141# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_183_141# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 VPWR a_183_141# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 X a_183_141# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 VGND A a_183_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 VGND a_183_141# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 X a_183_141# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X10 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X12 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X13 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X14 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X15 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X16 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X20 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X21 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X22 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X23 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X24 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X25 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X26 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X27 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X28 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X29 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X30 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X31 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X32 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X33 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X34 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X35 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X36 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X37 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X38 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X39 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X40 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X41 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X42 VPWR A a_183_141# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X43 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X44 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X45 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X46 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X47 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X48 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X49 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X50 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X51 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X52 a_183_141# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X53 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X54 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X55 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X56 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X57 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X58 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X59 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X60 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X61 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X62 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X63 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X64 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X65 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X66 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X67 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X68 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X69 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X70 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X71 VGND A a_183_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X72 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X73 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X74 a_183_141# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X75 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X76 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X77 X a_183_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X78 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X79 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X80 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X81 X a_183_141# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X82 VPWR a_183_141# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X83 VGND a_183_141# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_4.cdl b/cells/buf/sky130_fd_sc_hvl__buf_4.cdl
index 7139477..f263e40 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.75 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 nhv m=4 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=1 w=1.5 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 VPB phv m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=1 w=0.75 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_g5v0d10v5 m=4 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=1 w=1.5 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 VPB pfet_g5v0d10v5 m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_4
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_4.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_4.netlist.tsv
index f4c3890..94efc9d 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_4.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_4	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_4.spice b/cells/buf/sky130_fd_sc_hvl__buf_4.spice
index 9828477..83dd33a 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_4.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_4 A VGND VNB VPB VPWR X
-M1000 VGND a_149_81# X VNB nhv w=750000u l=500000u
-+  ad=6.3375e+11p pd=6.19e+06u as=4.2e+11p ps=4.12e+06u
-M1001 a_149_81# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=1.2675e+12p ps=1.069e+07u
-M1002 VGND a_149_81# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_149_81# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_149_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.4e+11p ps=7.12e+06u
-M1005 X a_149_81# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_149_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_149_81# A VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1008 X a_149_81# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_149_81# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_149_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 X a_149_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_149_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 X a_149_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 VGND a_149_81# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VGND A a_149_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VPWR a_149_81# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 VPWR A a_149_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 VGND a_149_81# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 VPWR a_149_81# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_8.cdl b/cells/buf/sky130_fd_sc_hvl__buf_8.cdl
index f52e168..a607aa3 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_hvl__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=3 w=0.75 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 nhv m=8 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=3 w=1.5 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 VPB phv m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=3 w=0.75 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_g5v0d10v5 m=8 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=3 w=1.5 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 VPB pfet_g5v0d10v5 m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__buf_8
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_8.netlist.tsv b/cells/buf/sky130_fd_sc_hvl__buf_8.netlist.tsv
index 996a477..53114b1 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_8.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_hvl__buf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__buf_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phv	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_g5v0d10v5	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_8.spice b/cells/buf/sky130_fd_sc_hvl__buf_8.spice
index b46e09c..dda601f 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_8.spice
+++ b/cells/buf/sky130_fd_sc_hvl__buf_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hvl__buf_8 A VGND VNB VPB VPWR X
-M1000 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=1.68e+12p pd=1.424e+07u as=2.9175e+12p ps=2.189e+07u
-M1001 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=8.4e+11p pd=8.24e+06u as=1.45875e+12p ps=1.289e+07u
-M1002 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_45_443# A VGND VNB nhv w=750000u l=500000u
-+  ad=4.2375e+11p pd=4.13e+06u as=0p ps=0u
-M1004 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.475e+11p ps=7.13e+06u
-M1007 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_45_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VGND A a_45_443# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X10 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X11 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X13 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 VPWR A a_45_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X16 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X17 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X18 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X20 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_hvl__conb_1.spice b/cells/conb/sky130_fd_sc_hvl__conb_1.spice
index 7cbfcd5..5c65b9f 100644
--- a/cells/conb/sky130_fd_sc_hvl__conb_1.spice
+++ b/cells/conb/sky130_fd_sc_hvl__conb_1.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_sc_hvl__conb_1 VGND VNB VPB VPWR HI LO
-R0 HI VPWR short w=510000u l=45000u
-R1 VGND LO short w=510000u l=45000u
+X0 HI VPWR VNB short w=510000u l=45000u
+X1 VGND LO VNB short w=510000u l=45000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_4.cdl b/cells/decap/sky130_fd_sc_hvl__decap_4.cdl
index 76473a7..24b8c3f 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_4.cdl
+++ b/cells/decap/sky130_fd_sc_hvl__decap_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__decap_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nhv m=1 w=0.75 l=1.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phv m=1 w=1.0 l=1.0 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VNB nfet_g5v0d10v5 m=1 w=0.75 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_g5v0d10v5 m=1 w=1.0 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__decap_4
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_4.netlist.tsv b/cells/decap/sky130_fd_sc_hvl__decap_4.netlist.tsv
index 0694225..ec96fc7 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_4.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hvl__decap_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__decap_4	VGND:I VNB:I VPB:I VPWR:I
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nhv	1	0.75	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phv	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_g5v0d10v5	1	0.75	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_g5v0d10v5	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_4.spice b/cells/decap/sky130_fd_sc_hvl__decap_4.spice
index 03b34fa..b5c2b5a 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_4.spice
+++ b/cells/decap/sky130_fd_sc_hvl__decap_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hvl__decap_4 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nhv w=750000u l=1e+06u
-+  ad=4.125e+11p pd=4.1e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB phv w=1e+06u l=1e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=1e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=1e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_8.cdl b/cells/decap/sky130_fd_sc_hvl__decap_8.cdl
index f22fffc..dda3844 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_8.cdl
+++ b/cells/decap/sky130_fd_sc_hvl__decap_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__decap_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nhv m=2 w=0.75 l=1.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB phv m=2 w=1.0 l=1.0 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VNB nfet_g5v0d10v5 m=2 w=0.75 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_g5v0d10v5 m=2 w=1.0 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__decap_8
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_8.netlist.tsv b/cells/decap/sky130_fd_sc_hvl__decap_8.netlist.tsv
index 56dd4e4..6242af8 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_8.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_hvl__decap_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__decap_8	VGND:I VNB:I VPB:I VPWR:I
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nhv	2	0.75	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phv	2	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_g5v0d10v5	2	0.75	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_g5v0d10v5	2	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_8.spice b/cells/decap/sky130_fd_sc_hvl__decap_8.spice
index 30ac5a4..f331acb 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_8.spice
+++ b/cells/decap/sky130_fd_sc_hvl__decap_8.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__decap_8 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phv w=1e+06u l=1e+06u
-+  ad=8.4e+11p pd=7.68e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nhv w=750000u l=1e+06u
-+  ad=6.225e+11p pd=6.16e+06u as=0p ps=0u
-M1002 VPWR VGND VPWR VPB phv w=1e+06u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND VPWR VGND VNB nhv w=750000u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=1e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=1e+06u
+X2 VPWR VGND VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=1e+06u
+X3 VGND VPWR VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=1e+06u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.cdl b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.cdl
index 86922e3..1807374 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.cdl
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_hvl__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI651 Q_N s0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI656 net062 s0 VNB nfet_g5v0d10v5 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
+MI657 net052 RESET_B VNB nfet_g5v0d10v5 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
+MI33 net51 RESET_B VNB nfet_g5v0d10v5 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
+MI4 M0 clkpos VNB nfet_g5v0d10v5 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
+MI34 net43 M1 VNB nfet_g5v0d10v5 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
+MI655 s0 clkneg VNB nfet_g5v0d10v5 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
+MI652 net069 s0 VNB nfet_g5v0d10v5 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
+MI653 Q net069 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI647 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI38 net098 RESET_B VNB nfet_g5v0d10v5 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
+MI649 M1 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI662 net089 net062 VPB pfet_g5v0d10v5 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
+MI659 net062 RESET_B VPB pfet_g5v0d10v5 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
+MI664 s0 clkpos VPB pfet_g5v0d10v5 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
+MI658 net062 s0 VPB pfet_g5v0d10v5 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
+MI30 net54 M1 VPB pfet_g5v0d10v5 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
+MI31 M0 clkneg VPB pfet_g5v0d10v5 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
+MI32 M0 RESET_B VPB pfet_g5v0d10v5 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
+MI663 net069 s0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net069 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 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_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 db RESET_B VPB pfet_g5v0d10v5 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
+MI40 db D VPB pfet_g5v0d10v5 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
-MI656 net062 s0 VNB nhv 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
-MI657 net052 RESET_B VNB nhv 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
-MI33 net51 RESET_B VNB nhv 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
-MI4 M0 clkpos VNB nhv 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
-MI34 net43 M1 VNB nhv 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
-MI655 s0 clkneg VNB nhv 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
-MI652 net069 s0 VNB nhv 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
-MI653 Q net069 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI647 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI39 db D VNB nhv 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
-MI38 net098 RESET_B VNB nhv 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
-MI649 M1 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI662 net089 net062 VPB phv 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
-MI659 net062 RESET_B VPB phv 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
-MI664 s0 clkpos VPB phv 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
-MI658 net062 s0 VPB phv 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
-MI30 net54 M1 VPB phv 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
-MI31 M0 clkneg VPB phv 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
-MI32 M0 RESET_B VPB phv 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
-MI663 net069 s0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net069 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phv 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
-MI40 db D VPB phv 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
-MI650 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.netlist.tsv b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.netlist.tsv
index c598c99..8592e71 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_hvl__dfrbp_1	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI651	MOSFET	Q_N	s0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net062	s0	net052	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net052	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net51	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net43	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net43	M1	net51	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net069	s0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net069	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net098	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net098	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net089	net062	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net089	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net54	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net54	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net069	s0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net069	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net062	s0	net052	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net052	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net51	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net43	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net43	M1	net51	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net069	s0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net069	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net098	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net098	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net089	net062	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net089	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net54	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net54	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net069	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net069	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.spice b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.spice
index cc21f4d..eae4d65 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.spice
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hvl__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_2412_107# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.24515e+12p ps=1.148e+07u
-M1001 a_2122_348# a_1900_107# a_2412_107# VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_1900_107# a_37_107# a_1176_466# VPB phv w=1e+06u l=500000u
-+  ad=3.312e+11p pd=2.79e+06u as=2.8e+11p ps=2.56e+06u
-M1003 a_350_107# a_37_107# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 VPWR CLK a_37_107# VPB phv w=750000u l=500000u
-+  ad=2.2032e+12p pd=1.785e+07u as=2.1375e+11p ps=2.07e+06u
-M1005 a_2114_107# a_37_107# a_1900_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.219e+11p ps=2.64e+06u
-M1006 a_978_608# a_37_107# a_509_608# VNB nhv w=420000u l=500000u
-+  ad=1.869e+11p pd=1.73e+06u as=1.176e+11p ps=1.4e+06u
-M1007 VGND a_2122_348# a_2114_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_509_608# D VPWR VPB phv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1009 a_1176_466# a_978_608# VPWR VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Q a_2937_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1011 a_978_608# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1012 VPWR a_1900_107# a_2122_348# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1013 a_728_173# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 a_509_608# D a_728_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_2079_462# a_350_107# a_1900_107# VPB phv w=420000u l=500000u
-+  ad=9.03e+10p pd=1.27e+06u as=0p ps=0u
-M1016 a_1900_107# a_350_107# a_1176_466# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.06e+06u
-M1017 Q_N a_1900_107# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1018 VPWR RESET_B a_509_608# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1134_608# a_37_107# a_978_608# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 VGND CLK a_37_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1021 Q a_2937_443# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1022 VPWR a_1176_466# a_1134_608# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_1900_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1024 VGND a_1900_107# a_2937_443# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1025 a_2122_348# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_350_107# a_37_107# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1027 VPWR a_2122_348# a_2079_462# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1215_173# a_350_107# a_978_608# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1029 VGND RESET_B a_1357_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=9.66e+10p ps=1.3e+06u
-M1030 a_978_608# a_350_107# a_509_608# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1357_173# a_1176_466# a_1215_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1176_466# a_978_608# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1900_107# a_2937_443# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
+X0 a_1176_466# a_350_107# a_1900_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_37_107# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 VGND a_2937_443# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_2122_348# a_1900_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 VPWR RESET_B a_978_608# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 VGND a_37_107# a_350_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 a_978_608# a_350_107# a_1215_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 VPWR a_2937_443# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_2412_107# a_1900_107# a_2122_348# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_978_608# a_37_107# a_1134_608# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X10 VPWR a_37_107# a_350_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 a_2114_107# a_2122_348# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X12 a_2937_443# a_1900_107# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 a_1900_107# a_350_107# a_2079_462# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 VPWR a_1900_107# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 a_2079_462# a_2122_348# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X16 a_509_608# a_37_107# a_978_608# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VGND RESET_B a_2412_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X18 VGND a_1900_107# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X19 a_1357_173# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 VPWR a_978_608# a_1176_466# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X21 a_1215_173# a_1176_466# a_1357_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 a_509_608# RESET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 VGND a_978_608# a_1176_466# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X24 a_2937_443# a_1900_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X25 a_509_608# a_350_107# a_978_608# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X26 VGND RESET_B a_728_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 a_37_107# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X28 a_728_173# D a_509_608# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X29 a_1900_107# a_37_107# a_2114_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X30 a_1134_608# a_1176_466# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X31 a_1176_466# a_37_107# a_1900_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X32 VPWR RESET_B a_2122_348# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X33 VPWR D a_509_608# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.cdl
index 7f19945..bb385b2 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI656 net062 s0 VNB nfet_g5v0d10v5 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
+MI657 net052 RESET_B VNB nfet_g5v0d10v5 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
+MI33 net51 RESET_B VNB nfet_g5v0d10v5 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
+MI4 M0 clkpos VNB nfet_g5v0d10v5 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
+MI34 net43 M1 VNB nfet_g5v0d10v5 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
+MI655 s0 clkneg VNB nfet_g5v0d10v5 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
+MI652 net069 s0 VNB nfet_g5v0d10v5 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
+MI653 Q net069 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI647 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 db D VNB nfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI38 net098 RESET_B VNB nfet_g5v0d10v5 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
+MI649 M1 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI662 net089 net062 VPB pfet_g5v0d10v5 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
+MI659 net062 RESET_B VPB pfet_g5v0d10v5 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
+MI664 s0 clkpos VPB pfet_g5v0d10v5 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
+MI658 net062 s0 VPB pfet_g5v0d10v5 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
+MI30 net54 M1 VPB pfet_g5v0d10v5 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
+MI31 M0 clkneg VPB pfet_g5v0d10v5 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
+MI32 M0 RESET_B VPB pfet_g5v0d10v5 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
+MI663 net069 s0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net069 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 db RESET_B VPB pfet_g5v0d10v5 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
+MI40 db D VPB pfet_g5v0d10v5 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
-MI656 net062 s0 VNB nhv 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
-MI657 net052 RESET_B VNB nhv 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
-MI33 net51 RESET_B VNB nhv 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
-MI4 M0 clkpos VNB nhv 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
-MI34 net43 M1 VNB nhv 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
-MI655 s0 clkneg VNB nhv 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
-MI652 net069 s0 VNB nhv 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
-MI653 Q net069 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI647 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI39 db D VNB nhv 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
-MI38 net098 RESET_B VNB nhv 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
-MI649 M1 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI662 net089 net062 VPB phv 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
-MI659 net062 RESET_B VPB phv 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
-MI664 s0 clkpos VPB phv 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
-MI658 net062 s0 VPB phv 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
-MI30 net54 M1 VPB phv 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
-MI31 M0 clkneg VPB phv 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
-MI32 M0 RESET_B VPB phv 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
-MI663 net069 s0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net069 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phv 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
-MI40 db D VPB phv 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
-MI650 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.netlist.tsv b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.netlist.tsv
index 75c1b40..af15ef6 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hvl__dfrtp_1	CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net062	s0	net052	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net052	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net51	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net43	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net43	M1	net51	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net069	s0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net069	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net098	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net098	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net089	net062	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net089	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net54	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net54	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net069	s0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net069	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net062	s0	net052	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net052	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net51	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net43	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net43	M1	net51	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net069	s0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net069	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net098	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net098	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net089	net062	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net089	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net54	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net54	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net069	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net069	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.spice b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.spice
index d0c49df..a3aa9bf 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.spice
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hvl__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_339_537# a_30_107# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=1.5252e+12p ps=1.436e+07u
-M1001 a_921_632# a_339_537# a_452_632# VPB phv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=2.373e+11p ps=2.81e+06u
-M1002 Q a_2649_207# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=1.2666e+12p ps=1.053e+07u
-M1003 a_1233_173# a_1119_506# a_1091_173# VNB nhv w=420000u l=500000u
-+  ad=9.87e+10p pd=1.31e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_1119_506# a_921_632# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=0p ps=0u
-M1005 a_2096_417# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 a_921_632# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1875_543# a_30_107# a_1119_506# VPB phv w=1e+06u l=500000u
-+  ad=3.312e+11p pd=2.79e+06u as=2.8e+11p ps=2.56e+06u
-M1008 a_921_632# a_30_107# a_452_632# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1009 a_452_632# D VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Q a_2649_207# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1011 a_2387_107# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_637_173# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_1077_632# a_30_107# a_921_632# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 a_452_632# D a_637_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_1875_543# a_2649_207# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1016 VGND CLK a_30_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1017 a_1875_543# a_339_537# a_1119_506# VNB nhv w=750000u l=500000u
-+  ad=3.0735e+11p pd=2.5e+06u as=0p ps=0u
-M1018 VPWR CLK a_30_107# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1019 VPWR a_1875_543# a_2649_207# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1020 a_1091_173# a_339_537# a_921_632# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_2096_417# a_2054_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1022 a_1119_506# a_921_632# VPWR VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_2096_417# a_1875_543# a_2387_107# VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1024 VPWR RESET_B a_452_632# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1875_543# a_2096_417# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1119_506# a_1077_632# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_2054_543# a_339_537# a_1875_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_339_537# a_30_107# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1029 VGND RESET_B a_1233_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2089_107# a_30_107# a_1875_543# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1031 VGND a_2096_417# a_2089_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1233_173# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 VGND RESET_B a_2387_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 VPWR a_921_632# a_1119_506# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X3 a_1091_173# a_1119_506# a_1233_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_30_107# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_2089_107# a_2096_417# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VPWR a_30_107# a_339_537# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X7 VGND RESET_B a_637_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR RESET_B a_921_632# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X9 VGND a_30_107# a_339_537# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_452_632# RESET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 a_2054_543# a_2096_417# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_921_632# a_339_537# a_1091_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 VPWR a_2649_207# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_1875_543# a_339_537# a_2054_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 a_1119_506# a_30_107# a_1875_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X16 a_2387_107# a_1875_543# a_2096_417# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 a_2096_417# a_1875_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 a_1077_632# a_1119_506# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 a_30_107# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X20 a_1119_506# a_339_537# a_1875_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X21 VPWR D a_452_632# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X22 a_921_632# a_30_107# a_1077_632# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 VPWR RESET_B a_2096_417# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X24 a_637_173# D a_452_632# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 a_2649_207# a_1875_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X26 VGND a_921_632# a_1119_506# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X27 a_2649_207# a_1875_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X28 a_452_632# a_339_537# a_921_632# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 a_1875_543# a_30_107# a_2089_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X30 VGND a_2649_207# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X31 a_452_632# a_30_107# a_921_632# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.cdl b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.cdl
index 2d179a6..e08eb5d 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.cdl
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_hvl__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI36 net060 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI36 net060 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI39 db D VNB nfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_g5v0d10v5 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
+MI654 net0104 M1 VNB nfet_g5v0d10v5 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
+MI34 S0 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI25 net52 SET_B VNB nfet_g5v0d10v5 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
+MI26 S0 clkneg VNB nfet_g5v0d10v5 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
+MI27 net44 S1 VNB nfet_g5v0d10v5 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
+MI647 S1 S0 VNB nfet_g5v0d10v5 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
+MI655 M0 clkpos VNB nfet_g5v0d10v5 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
+MI657 net0107 SET_B VNB nfet_g5v0d10v5 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
+MI651 Q_N S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net072 S0 VNB nfet_g5v0d10v5 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
+MI653 Q net072 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_g5v0d10v5 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
-MI44 clkneg CLK VNB nhv 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
-MI39 db D VNB nhv 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
-MI656 M1 M0 VNB nhv 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
-MI654 net0104 M1 VNB nhv 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
-MI34 S0 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv 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
-MI25 net52 SET_B VNB nhv 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
-MI26 S0 clkneg VNB nhv 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
-MI27 net44 S1 VNB nhv 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
-MI647 S1 S0 VNB nhv 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
-MI655 M0 clkpos VNB nhv 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
-MI657 net0107 SET_B VNB nhv 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
-MI651 Q_N S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI652 net072 S0 VNB nhv 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
-MI653 Q net072 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phv 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
-MI38 S0 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net0127 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB phv 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
-MI662 net0172 M1 VPB phv 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
-MI664 M0 clkneg VPB phv 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
-MI6 net55 S1 VPB phv 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
-MI5 S0 clkpos VPB phv 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
-MI24 S0 SET_B VPB phv 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
-MI648 S1 S0 VPB phv 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
-MI658 M1 M0 VPB phv 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
-MI663 net072 S0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net072 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net0127 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 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_g5v0d10v5 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
+MI662 net0172 M1 VPB pfet_g5v0d10v5 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
+MI664 M0 clkneg VPB pfet_g5v0d10v5 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
+MI6 net55 S1 VPB pfet_g5v0d10v5 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
+MI5 S0 clkpos VPB pfet_g5v0d10v5 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
+MI24 S0 SET_B VPB pfet_g5v0d10v5 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
+MI648 S1 S0 VPB pfet_g5v0d10v5 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
+MI658 M1 M0 VPB pfet_g5v0d10v5 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
+MI663 net072 S0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net072 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 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_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.netlist.tsv b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.netlist.tsv
index f4b63b0..298719f 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_hvl__dfsbp_1	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net060	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net0107	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net0104	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net060	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net52	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net44	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net44	S1	net52	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net0104	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net0107	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net072	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net072	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net0127	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net0127	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net0172	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net0172	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net55	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net55	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net072	S0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net072	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net060	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net0107	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net0104	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net060	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net52	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net44	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net44	S1	net52	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net0104	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net0107	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net072	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net072	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net0127	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net0127	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net0172	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net0172	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net55	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net55	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net072	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net072	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.spice b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.spice
index 893464d..047d515 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.spice
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_hvl__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1874_543# a_30_112# a_1732_543# VPB phv w=1e+06u l=500000u
-+  ad=4.509e+11p pd=4.2e+06u as=2.1e+11p ps=2.42e+06u
-M1001 a_605_109# D VGND VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.18635e+12p ps=1.226e+07u
-M1002 Q a_3129_479# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1003 VGND a_1874_543# a_2156_417# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1004 a_1874_543# SET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=2.0131e+12p ps=1.705e+07u
-M1005 a_339_112# a_30_112# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_959_83# a_761_109# VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_917_109# a_339_112# a_761_109# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1008 VGND a_959_83# a_917_109# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_959_83# a_976_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_1642_107# a_339_112# a_1874_543# VNB nhv w=750000u l=500000u
-+  ad=5.7375e+11p pd=4.53e+06u as=4.042e+11p ps=2.92e+06u
-M1011 VPWR a_2156_417# a_2053_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=2.163e+11p ps=1.87e+06u
-M1012 a_761_109# a_339_112# a_605_109# VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1013 VGND a_1874_543# a_3129_479# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1014 a_761_109# a_30_112# a_605_109# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_3129_479# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1016 Q_N a_1874_543# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1017 VPWR CLK a_30_112# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1018 Q_N a_1874_543# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1019 a_2427_107# a_2156_417# a_1755_153# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.31e+11p ps=2.78e+06u
-M1020 VGND SET_B a_2427_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2053_543# a_339_112# a_1874_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_605_109# D VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_30_112# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1024 VPWR a_1874_543# a_3129_479# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1025 a_1325_107# a_761_109# a_959_83# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1026 VPWR a_1874_543# a_2156_417# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1027 VGND SET_B a_1325_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1874_543# a_30_112# a_1755_153# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1642_107# a_761_109# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_339_112# a_30_112# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1031 a_976_543# a_30_112# a_761_109# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR SET_B a_959_83# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1732_543# a_761_109# VPWR VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_605_109# a_339_112# a_761_109# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 VPWR a_761_109# a_1732_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X2 a_1755_153# a_30_112# a_1874_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_917_109# a_959_83# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 VGND a_761_109# a_1642_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 a_1325_107# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 a_1874_543# a_339_112# a_1642_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_30_112# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X8 a_2427_107# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 VPWR a_3129_479# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X10 a_3129_479# a_1874_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 VPWR a_30_112# a_339_112# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X12 VPWR a_761_109# a_959_83# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X13 VPWR a_1874_543# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_2156_417# a_1874_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 a_2053_543# a_2156_417# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X16 VGND a_30_112# a_339_112# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VGND a_3129_479# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 VGND D a_605_109# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 a_1874_543# a_339_112# a_2053_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 a_976_543# a_959_83# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X21 a_1732_543# a_30_112# a_1874_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X22 a_761_109# a_339_112# a_917_109# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X23 a_959_83# SET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X24 VPWR SET_B a_1874_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X25 a_959_83# a_761_109# a_1325_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X26 a_2156_417# a_1874_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 a_1755_153# a_2156_417# a_2427_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X28 VPWR D a_605_109# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 VGND a_1874_543# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X30 a_761_109# a_30_112# a_976_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X31 a_605_109# a_30_112# a_761_109# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X32 a_3129_479# a_1874_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X33 a_30_112# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.cdl
index acb19f7..1c36056 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 net060 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI36 net060 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI39 db D VNB nfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_g5v0d10v5 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
+MI654 net0104 M1 VNB nfet_g5v0d10v5 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
+MI34 S0 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI25 net52 SET_B VNB nfet_g5v0d10v5 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
+MI26 S0 clkneg VNB nfet_g5v0d10v5 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
+MI27 net44 S1 VNB nfet_g5v0d10v5 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
+MI647 S1 S0 VNB nfet_g5v0d10v5 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
+MI655 M0 clkpos VNB nfet_g5v0d10v5 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
+MI657 net0107 SET_B VNB nfet_g5v0d10v5 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
+MI652 net072 S0 VNB nfet_g5v0d10v5 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
+MI653 Q net072 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_g5v0d10v5 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
-MI44 clkneg CLK VNB nhv 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
-MI39 db D VNB nhv 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
-MI656 M1 M0 VNB nhv 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
-MI654 net0104 M1 VNB nhv 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
-MI34 S0 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv 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
-MI25 net52 SET_B VNB nhv 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
-MI26 S0 clkneg VNB nhv 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
-MI27 net44 S1 VNB nhv 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
-MI647 S1 S0 VNB nhv 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
-MI655 M0 clkpos VNB nhv 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
-MI657 net0107 SET_B VNB nhv 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
-MI652 net072 S0 VNB nhv 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
-MI653 Q net072 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phv 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
-MI38 S0 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net0127 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB phv 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
-MI662 net0172 M1 VPB phv 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
-MI664 M0 clkneg VPB phv 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
-MI6 net55 S1 VPB phv 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
-MI5 S0 clkpos VPB phv 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
-MI24 S0 SET_B VPB phv 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
-MI648 S1 S0 VPB phv 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
-MI658 M1 M0 VPB phv 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
-MI663 net072 S0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net072 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net0127 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 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_g5v0d10v5 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
+MI662 net0172 M1 VPB pfet_g5v0d10v5 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
+MI664 M0 clkneg VPB pfet_g5v0d10v5 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
+MI6 net55 S1 VPB pfet_g5v0d10v5 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
+MI5 S0 clkpos VPB pfet_g5v0d10v5 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
+MI24 S0 SET_B VPB pfet_g5v0d10v5 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
+MI648 S1 S0 VPB pfet_g5v0d10v5 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
+MI658 M1 M0 VPB pfet_g5v0d10v5 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
+MI663 net072 S0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net072 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.netlist.tsv b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.netlist.tsv
index d47f3c1..3b25623 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hvl__dfstp_1	CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI36	MOSFET	net060	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net0107	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net0104	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net060	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net52	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net44	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net44	S1	net52	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net0104	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net0107	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net072	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net072	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net0127	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net0127	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net0172	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net0172	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net55	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net55	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net072	S0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net072	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net060	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net0107	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net0104	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net060	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net52	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net44	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net44	S1	net52	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net0104	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net0107	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net072	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net072	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net0127	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net0127	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net0172	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net0172	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net55	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net55	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net072	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net072	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.spice b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.spice
index feac2dc..263b641 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.spice
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hvl__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_1000_81# a_982_529# VPB phv w=420000u l=500000u
-+  ad=1.5397e+12p pd=1.406e+07u as=8.82e+10p ps=1.26e+06u
-M1001 Q a_2553_203# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1002 a_642_107# D VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 VGND a_1000_81# a_958_107# VNB nhv w=420000u l=500000u
-+  ad=9.711e+11p pd=1.012e+07u as=8.82e+10p ps=1.26e+06u
-M1004 VGND a_1787_137# a_2553_203# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 VPWR a_1787_137# a_2553_203# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1006 a_798_107# a_30_131# a_642_107# VNB nhv w=420000u l=500000u
-+  ad=1.26e+11p pd=1.44e+06u as=1.176e+11p ps=1.4e+06u
-M1007 a_2031_177# a_1787_137# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 Q a_2553_203# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1009 a_1000_81# a_798_107# VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1010 a_1787_137# SET_B VPWR VPB phv w=420000u l=500000u
-+  ad=5.2205e+11p pd=4.35e+06u as=0p ps=0u
-M1011 a_1653_515# a_798_107# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1012 VPWR a_1787_137# a_2031_177# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.848e+11p ps=1.72e+06u
-M1013 a_1645_137# a_798_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1014 a_1787_137# a_30_131# a_1653_515# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1787_137# a_340_593# a_1645_137# VNB nhv w=750000u l=500000u
-+  ad=2.967e+11p pd=2.52e+06u as=0p ps=0u
-M1016 VPWR CLK a_30_131# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1017 VGND CLK a_30_131# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 a_1989_203# a_30_131# a_1787_137# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1019 a_2131_203# a_2031_177# a_1989_203# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 VGND SET_B a_2131_203# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_982_529# a_30_131# a_798_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1022 VGND SET_B a_1268_251# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=2.838e+11p ps=2.34e+06u
-M1023 a_958_107# a_340_593# a_798_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_798_107# a_340_593# a_642_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1268_251# a_798_107# a_1000_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1026 VPWR SET_B a_1000_81# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_642_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_340_593# a_30_131# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1029 a_340_593# a_30_131# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1030 a_1989_515# a_340_593# a_1787_137# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1031 VPWR a_2031_177# a_1989_515# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_30_131# a_340_593# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X1 a_2553_203# a_1787_137# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 VPWR a_2553_203# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X3 VGND a_798_107# a_1645_137# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_958_107# a_1000_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_1989_203# a_2031_177# a_2131_203# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 a_1268_251# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_982_529# a_1000_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR a_798_107# a_1000_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X9 a_1653_515# a_30_131# a_1787_137# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X10 VGND a_1787_137# a_2031_177# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 a_1787_137# a_340_593# a_1989_515# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_642_107# a_340_593# a_798_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X13 a_2553_203# a_1787_137# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 a_798_107# a_30_131# a_982_529# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 VPWR SET_B a_1787_137# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X16 a_642_107# a_30_131# a_798_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 a_1645_137# a_340_593# a_1787_137# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 VGND a_2553_203# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X19 a_2031_177# a_1787_137# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 a_1000_81# a_798_107# a_1268_251# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X21 a_30_131# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 VGND D a_642_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X23 a_2131_203# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X24 a_1989_515# a_2031_177# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X25 a_1000_81# SET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X26 VGND a_30_131# a_340_593# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 VPWR D a_642_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X28 VPWR a_798_107# a_1653_515# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X29 a_30_131# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X30 a_798_107# a_340_593# a_958_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X31 a_1787_137# a_30_131# a_1989_203# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.cdl b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.cdl
index 0b83241..82f1bca 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.cdl
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_hvl__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI657 M0 clkpos VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_g5v0d10v5 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
+MI656 net72 M1 VNB nfet_g5v0d10v5 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
+MI646 Q S1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net116 S1 VNB nfet_g5v0d10v5 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
+MI648 db clkneg VNB nfet_g5v0d10v5 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
+MI654 db D VNB nfet_g5v0d10v5 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
+MI642 S0 clkneg VNB nfet_g5v0d10v5 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
+MI641 net48 S1 VNB nfet_g5v0d10v5 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
+MI661 Q_N net116 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_g5v0d10v5 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
+MI649 S1 S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI634 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_g5v0d10v5 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
+MI660 Q_N net116 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_g5v0d10v5 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
+MI647 net116 S1 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net119 S1 VPB pfet_g5v0d10v5 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
+MI638 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net100 M1 VPB pfet_g5v0d10v5 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
+MI645 Q S1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net72 M1 VNB nhv 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
-MI646 Q S1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI662 net116 S1 VNB nhv 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
-MI648 db clkneg VNB nhv 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
-MI654 db D VNB nhv 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
-MI642 S0 clkneg VNB nhv 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
-MI641 net48 S1 VNB nhv 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
-MI661 Q_N net116 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nhv 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
-MI649 S1 S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI634 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phv 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
-MI660 Q_N net116 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phv 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
-MI647 net116 S1 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI643 net119 S1 VPB phv 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
-MI638 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net100 M1 VPB phv 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
-MI645 Q S1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phv 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
-MI655 db D VPB phv 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
-MI653 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_g5v0d10v5 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
+MI655 db D VPB pfet_g5v0d10v5 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
+MI653 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.netlist.tsv b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.netlist.tsv
index 5652d55..42e2fe0 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_hvl__dfxbp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net72	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net116	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net48	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net116	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net100	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net116	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net119	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net116	S1	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net119	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net116	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net48	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net116	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net100	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net116	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net119	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net116	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net119	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.spice b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.spice
index fcd6e70..388ffe8 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.spice
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_hvl__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_1494_539# a_30_112# a_1063_85# VPB phv w=1e+06u l=500000u
-+  ad=3.112e+11p pd=2.75e+06u as=2.8e+11p ps=2.56e+06u
-M1001 VPWR a_1711_85# Q VPB phv w=1.5e+06u l=500000u
-+  ad=1.8596e+12p pd=1.629e+07u as=3.975e+11p ps=3.53e+06u
-M1002 a_1669_539# a_339_112# a_1494_539# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_1711_85# a_1494_539# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 a_339_112# a_30_112# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.2345e+12p ps=1.183e+07u
-M1005 VPWR a_1711_85# a_2365_443# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1006 a_709_111# D VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_1669_111# a_30_112# a_1494_539# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1008 VPWR a_1711_85# a_1669_539# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1711_85# a_1494_539# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1010 VGND a_1711_85# Q VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1011 a_1021_539# a_30_112# a_865_111# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1012 VPWR CLK a_30_112# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1013 a_709_111# D VGND VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1014 VGND a_1711_85# a_2365_443# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 VPWR a_1063_85# a_1021_539# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1711_85# a_1669_111# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1063_85# a_865_111# VPWR VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1021_111# a_339_112# a_865_111# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1019 a_865_111# a_339_112# a_709_111# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_2365_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1021 VGND a_1063_85# a_1021_111# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_339_112# a_30_112# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1023 a_1063_85# a_865_111# VGND VNB nhv w=750000u l=500000u
-+  ad=2.4495e+11p pd=2.25e+06u as=0p ps=0u
-M1024 a_1494_539# a_339_112# a_1063_85# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND CLK a_30_112# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1026 a_865_111# a_30_112# a_709_111# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_2365_443# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
+X0 a_1021_111# a_1063_85# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_1669_111# a_1711_85# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 VPWR a_865_111# a_1063_85# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X3 a_865_111# a_339_112# a_1021_111# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_1494_539# a_30_112# a_1669_111# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 VPWR D a_709_111# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 VPWR a_1494_539# a_1711_85# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X7 a_1063_85# a_339_112# a_1494_539# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 Q a_1711_85# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 VGND a_865_111# a_1063_85# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X10 a_1063_85# a_30_112# a_1494_539# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X11 VGND a_30_112# a_339_112# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X12 a_30_112# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X13 Q a_1711_85# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_2365_443# a_1711_85# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 a_2365_443# a_1711_85# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X16 VGND D a_709_111# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VPWR a_30_112# a_339_112# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X18 a_709_111# a_339_112# a_865_111# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 VGND a_1494_539# a_1711_85# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X20 VPWR a_2365_443# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 a_1021_539# a_1063_85# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X22 a_1669_539# a_1711_85# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 a_865_111# a_30_112# a_1021_539# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X24 a_1494_539# a_339_112# a_1669_539# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X25 a_30_112# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X26 a_709_111# a_30_112# a_865_111# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 VGND a_2365_443# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.cdl b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.cdl
index 679d8c3..798f85e 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.cdl
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_hvl__dfxtp_1 CLK D VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI657 M0 clkpos VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_g5v0d10v5 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
+MI656 net72 M1 VNB nfet_g5v0d10v5 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
+MI646 Q S1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_g5v0d10v5 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
+MI654 db D VNB nfet_g5v0d10v5 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
+MI642 S0 clkneg VNB nfet_g5v0d10v5 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
+MI641 net48 S1 VNB nfet_g5v0d10v5 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
+MI652 M1 clkpos VNB nfet_g5v0d10v5 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
+MI649 S1 S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI634 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_g5v0d10v5 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
+MI650 S1 S0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_g5v0d10v5 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
+MI639 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net119 S1 VPB pfet_g5v0d10v5 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
+MI638 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net100 M1 VPB pfet_g5v0d10v5 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
+MI645 Q S1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net72 M1 VNB nhv 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
-MI646 Q S1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nhv 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
-MI654 db D VNB nhv 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
-MI642 S0 clkneg VNB nhv 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
-MI641 net48 S1 VNB nhv 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
-MI652 M1 clkpos VNB nhv 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
-MI649 S1 S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI634 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phv 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
-MI650 S1 S0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phv 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
-MI639 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI643 net119 S1 VPB phv 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
-MI638 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net100 M1 VPB phv 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
-MI645 Q S1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phv 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
-MI655 db D VPB phv 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
-MI653 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_g5v0d10v5 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
+MI655 db D VPB pfet_g5v0d10v5 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
+MI653 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.netlist.tsv b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.netlist.tsv
index 099083e..2de25ca 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_hvl__dfxtp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net72	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net48	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net100	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net119	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net119	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net48	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net100	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net119	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net119	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.spice b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.spice
index 2663042..491e334 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.spice
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hvl__dfxtp_1 CLK D VGND VNB VPB VPWR Q
-M1000 a_982_543# a_30_127# a_780_574# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.5915e+11p ps=2.17e+06u
-M1001 a_339_559# a_30_127# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=1.3412e+12p ps=1.246e+07u
-M1002 a_1687_113# a_30_127# a_1455_543# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1003 a_1024_371# a_780_574# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 a_339_559# a_30_127# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.09365e+12p ps=9.95e+06u
-M1005 a_1015_113# a_339_559# a_780_574# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.995e+11p ps=1.79e+06u
-M1006 VPWR a_1024_371# a_982_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_1024_371# a_1015_113# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_1729_87# a_1687_113# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_1729_87# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1010 a_1455_543# a_339_559# a_1024_371# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=2.5995e+11p ps=2.29e+06u
-M1011 VPWR CLK a_30_127# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1012 a_780_574# a_339_559# a_605_563# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.652e+11p ps=1.7e+06u
-M1013 a_780_574# a_30_127# a_605_563# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1014 a_1731_543# a_339_559# a_1455_543# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.162e+11p ps=3.76e+06u
-M1015 VPWR a_1729_87# a_1731_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_605_563# D VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_605_563# D VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1729_87# a_1455_543# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1019 a_1729_87# a_1455_543# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1020 a_1455_543# a_30_127# a_1024_371# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1024_371# a_780_574# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND CLK a_30_127# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1023 Q a_1729_87# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
+X0 a_780_574# a_30_127# a_982_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 VPWR a_1455_543# a_1729_87# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X2 VGND a_1729_87# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_1015_113# a_1024_371# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 VPWR a_780_574# a_1024_371# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X5 a_1455_543# a_339_559# a_1731_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND a_1455_543# a_1729_87# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_780_574# a_339_559# a_1015_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 a_30_127# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X9 a_1455_543# a_30_127# a_1687_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_605_563# a_30_127# a_780_574# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 a_1024_371# a_30_127# a_1455_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X12 a_1024_371# a_339_559# a_1455_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 a_605_563# a_339_559# a_780_574# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 a_30_127# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 VGND a_780_574# a_1024_371# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X16 VPWR a_1729_87# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 VPWR D a_605_563# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 VGND a_30_127# a_339_559# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 VGND D a_605_563# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 a_982_543# a_1024_371# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X21 a_1687_113# a_1729_87# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 a_1731_543# a_1729_87# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 VPWR a_30_127# a_339_559# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/diode/sky130_fd_sc_hvl__diode_2.spice b/cells/diode/sky130_fd_sc_hvl__diode_2.spice
index 23f113c..f0b4bc1 100644
--- a/cells/diode/sky130_fd_sc_hvl__diode_2.spice
+++ b/cells/diode/sky130_fd_sc_hvl__diode_2.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_hvl__diode_2 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode_h p=5.88e+06u a=6.072e+11p
+X0 VNB DIODE ndiode_h p=5.88e+06u a=6.072e+11p
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.cdl b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.cdl
index e62e7bf..fd4c0cf 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.cdl
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hvl__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI635 clkneg clkpos VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 M1 M0 VPB phv 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
-MI29 net048 M1 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 net048 CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 GCLK net048 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net59 M1 VPB phv 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
-MI651 M0 clkpos VPB phv 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
-MI638 net043 GATE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 M0 clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos CLK VNB nhv 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
-MI649 GCLK net048 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net084 CLK VNB nhv 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
-MI652 M0 clkneg VNB nhv 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
-MI654 net102 M1 VNB nhv 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
-MI26 net076 GATE VNB nhv 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
-MI636 clkneg clkpos VNB nhv 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
-MI637 M0 clkpos VNB nhv 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
-MI30 net048 M1 VNB nhv 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
-MI23 M1 M0 VNB nhv 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
+MI635 clkneg clkpos VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 M1 M0 VPB pfet_g5v0d10v5 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
+MI29 net048 M1 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 net048 CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 GCLK net048 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 clkpos CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 net59 M1 VPB pfet_g5v0d10v5 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
+MI651 M0 clkpos VPB pfet_g5v0d10v5 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
+MI638 net043 GATE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 M0 clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos CLK VNB nfet_g5v0d10v5 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
+MI649 GCLK net048 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net084 CLK VNB nfet_g5v0d10v5 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
+MI652 M0 clkneg VNB nfet_g5v0d10v5 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
+MI654 net102 M1 VNB nfet_g5v0d10v5 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
+MI26 net076 GATE VNB nfet_g5v0d10v5 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
+MI636 clkneg clkpos VNB nfet_g5v0d10v5 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
+MI637 M0 clkpos VNB nfet_g5v0d10v5 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
+MI30 net048 M1 VNB nfet_g5v0d10v5 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
+MI23 M1 M0 VNB nfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.netlist.tsv b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.netlist.tsv
index 70be18c..01c0b1a 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hvl__dlclkp_1	CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net048	M1	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net048	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	GCLK	net048	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net59	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	net043	GATE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	M0	clkneg	net043	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	GCLK	net048	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net084	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net076	GATE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	M0	clkpos	net076	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net048	M1	net084	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	M1	M0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net048	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net048	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	GCLK	net048	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net59	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	net043	GATE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	M0	clkneg	net043	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	GCLK	net048	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net084	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net076	GATE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	M0	clkpos	net076	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net048	M1	net084	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.spice b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.spice
index 2ca84a2..a43b659 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.spice
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hvl__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_189_445# GATE VPWR VPB phv w=750000u l=500000u
-+  ad=1.875e+11p pd=2e+06u as=1.20135e+12p ps=1.126e+07u
-M1001 a_1069_133# a_303_311# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=5.8935e+11p ps=6.41e+06u
-M1002 a_189_159# GATE VGND VNB nhv w=420000u l=500000u
-+  ad=1.05e+11p pd=1.34e+06u as=0p ps=0u
-M1003 a_1438_171# a_1069_133# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=0p ps=0u
-M1004 a_1027_159# a_239_419# a_303_311# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.226e+11p ps=2.74e+06u
-M1005 a_231_71# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_231_71# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1007 a_303_311# a_239_419# a_189_445# VPB phv w=750000u l=500000u
-+  ad=3.1005e+11p pd=3.4e+06u as=0p ps=0u
-M1008 a_1069_133# a_303_311# VPWR VPB phv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VGND a_1069_133# a_1027_159# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 GCLK a_1438_171# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1011 VGND CLK a_1591_171# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1012 a_303_311# a_231_71# a_189_159# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1027_457# a_231_71# a_303_311# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 VPWR a_1069_133# a_1027_457# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1591_171# a_1069_133# a_1438_171# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1016 GCLK a_1438_171# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1017 VGND a_231_71# a_239_419# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 VPWR a_231_71# a_239_419# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1019 VPWR CLK a_1438_171# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_303_311# a_239_419# a_1027_159# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_189_159# a_231_71# a_303_311# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 VGND a_1438_171# GCLK VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VGND GATE a_189_159# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 VGND a_303_311# a_1069_133# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_189_445# a_239_419# a_303_311# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X6 VPWR GATE a_189_445# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X7 a_239_419# a_231_71# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X8 VPWR a_1438_171# GCLK VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 a_1438_171# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X10 a_239_419# a_231_71# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 a_1027_457# a_1069_133# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_1591_171# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 VPWR a_1069_133# a_1438_171# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X14 VPWR CLK a_231_71# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X15 a_303_311# a_231_71# a_1027_457# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X16 VPWR a_303_311# a_1069_133# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X17 VGND CLK a_231_71# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X18 a_1438_171# a_1069_133# a_1591_171# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 a_1027_159# a_1069_133# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.cdl
index d5aabc5..263a697 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 M0 clkpos VPB phv 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
-MI25 net76 clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q net96 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI30 VPWR db VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI32 net96 M0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net79 net96 VPB phv 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
-MI26 net96 RESET_B VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nhv 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
-MI649 Q net96 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net116 net96 VNB nhv 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
-MI24 net99 clkpos VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI637 db D VNB nhv 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
-MI31 VGND db VNB nhv 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
-MI33 net96 M0 VNB nhv 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
-MI27 net95 RESET_B VNB nhv 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
-MI23 M0 clkneg VNB nhv 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
+MI635 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 M0 clkpos VPB pfet_g5v0d10v5 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
+MI25 net76 clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q net96 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 clkneg GATE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 VPWR db VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net96 M0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 net79 net96 VPB pfet_g5v0d10v5 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
+MI26 net96 RESET_B VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_g5v0d10v5 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
+MI649 Q net96 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net116 net96 VNB nfet_g5v0d10v5 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
+MI24 net99 clkpos VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI637 db D VNB nfet_g5v0d10v5 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
+MI31 VGND db VNB nfet_g5v0d10v5 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
+MI33 net96 M0 VNB nfet_g5v0d10v5 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
+MI27 net95 RESET_B VNB nfet_g5v0d10v5 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
+MI23 M0 clkneg VNB nfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.netlist.tsv b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.netlist.tsv
index 3b11a52..c6fff40 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_hvl__dlrtp_1	D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	M0	clkpos	net79	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net76	clkneg	M0	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	net96	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	VPWR	db	net76	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net96	M0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net79	net96	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net96	RESET_B	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	net96	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net116	net96	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net99	clkpos	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	VGND	db	net99	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net96	M0	net95	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net95	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	M0	clkneg	net116	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	M0	clkpos	net79	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net76	clkneg	M0	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	net96	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	VPWR	db	net76	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net96	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net79	net96	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net96	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	net96	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net116	net96	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net99	clkpos	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	VGND	db	net99	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net96	M0	net95	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net95	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	M0	clkneg	net116	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.spice b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.spice
index fe7975b..fc80411 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.spice
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hvl__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 a_1512_107# a_917_107# a_1138_81# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1001 VPWR a_345_107# a_462_107# VPB phv w=750000u l=500000u
-+  ad=1.18995e+12p pd=1.02e+07u as=2.1375e+11p ps=2.07e+06u
-M1002 VPWR RESET_B a_1138_81# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.06e+06u
-M1003 VGND RESET_B a_1512_107# VNB nhv w=420000u l=500000u
-+  ad=6.1485e+11p pd=6.5e+06u as=0p ps=0u
-M1004 a_1096_107# a_345_107# a_917_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.659e+11p ps=1.63e+06u
-M1005 a_345_107# GATE VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1006 a_1096_491# a_462_107# a_917_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.5995e+11p ps=2.29e+06u
-M1007 a_345_107# GATE VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 a_775_107# a_32_107# VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND a_1138_81# a_1096_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_775_491# a_32_107# VPWR VPB phv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1011 a_1138_81# a_917_107# VPWR VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_917_107# a_462_107# a_775_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1138_81# a_1096_491# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR D a_32_107# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1015 Q a_1138_81# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1016 a_917_107# a_345_107# a_775_491# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q a_1138_81# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1018 VGND a_345_107# a_462_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 VGND D a_32_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_1096_491# a_1138_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 a_775_491# a_345_107# a_917_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 a_1096_107# a_1138_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_917_107# a_462_107# a_1096_491# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 a_775_107# a_462_107# a_917_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 VPWR a_917_107# a_1138_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X6 a_462_107# a_345_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X7 a_1138_81# a_917_107# a_1512_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 a_917_107# a_345_107# a_1096_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_462_107# a_345_107# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 VPWR a_1138_81# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 a_1138_81# RESET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X12 a_32_107# D VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 VPWR a_32_107# a_775_491# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X14 VGND GATE a_345_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 a_32_107# D VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X16 VGND a_32_107# a_775_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VGND a_1138_81# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 VPWR GATE a_345_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X19 a_1512_107# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.cdl b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.cdl
index 3c4a572..1a2e5bb 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.cdl
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_hvl__dlxtp_1 D GATE VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI635 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net069 M0 VPB pfet_g5v0d10v5 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
+MI25 db clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q M0 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net069 M0 VPB phv 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
-MI25 db clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q M0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net59 net069 VPB phv 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
-MI651 M0 clkpos VPB phv 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
-MI638 db D VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI634 clkneg GATE VNB nhv 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
-MI649 Q M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nhv 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
-MI654 net102 net069 VNB nhv 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
-MI24 db clkpos VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI637 db D VNB nhv 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
-MI23 net069 M0 VNB nhv 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
+MI633 clkneg GATE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 net59 net069 VPB pfet_g5v0d10v5 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
+MI651 M0 clkpos VPB pfet_g5v0d10v5 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
+MI638 db D VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_g5v0d10v5 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
+MI649 Q M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_g5v0d10v5 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
+MI654 net102 net069 VNB nfet_g5v0d10v5 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
+MI24 db clkpos VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI637 db D VNB nfet_g5v0d10v5 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
+MI23 net069 M0 VNB nfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__dlxtp_1
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.netlist.tsv b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.netlist.tsv
index 460db83..bc06eb7 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_hvl__dlxtp_1	D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net069	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	db	clkneg	M0	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	M0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	net069	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net59	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	net069	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	db	clkpos	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net069	M0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net069	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	db	clkneg	M0	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	net069	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net59	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	net069	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	db	clkpos	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net069	M0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.spice b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.spice
index 65c748b..74f488a 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.spice
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hvl__dlxtp_1 D GATE VGND VNB VPB VPWR Q
-M1000 a_384_107# a_30_443# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=6.0015e+11p ps=6.43e+06u
-M1001 VPWR a_1004_81# a_1014_587# VPB phv w=420000u l=500000u
-+  ad=1.2234e+12p pd=9.88e+06u as=8.82e+10p ps=1.26e+06u
-M1002 Q a_806_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1003 VGND a_806_107# a_1004_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_650_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 VPWR GATE a_30_443# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1006 a_806_107# a_30_443# a_650_107# VPB phv w=750000u l=500000u
-+  ad=2.5995e+11p pd=2.29e+06u as=2.6625e+11p ps=2.21e+06u
-M1007 a_962_107# a_30_443# a_806_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1008 VPWR a_806_107# a_1004_81# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 Q a_806_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1010 VGND GATE a_30_443# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_384_107# a_30_443# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1012 VGND a_1004_81# a_962_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_650_107# D VPWR VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1014_587# a_384_107# a_806_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_806_107# a_384_107# a_650_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_650_107# a_384_107# a_806_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_30_443# GATE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 a_962_107# a_1004_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 VPWR D a_650_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X4 VGND D a_650_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 VGND a_806_107# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 a_1014_587# a_1004_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X7 VPWR a_806_107# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_806_107# a_30_443# a_962_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_1004_81# a_806_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X10 a_30_443# GATE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 VPWR a_30_443# a_384_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X12 a_806_107# a_384_107# a_1014_587# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X13 a_650_107# a_30_443# a_806_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X14 a_1004_81# a_806_107# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 VGND a_30_443# a_384_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn_1.cdl b/cells/einvn/sky130_fd_sc_hvl__einvn_1.cdl
index 4caf7fe..845b63c 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 TE TE_B VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA TE VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 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_g5v0d10v5 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
+MMP0 VPWR TE_B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 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_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn_1.netlist.tsv b/cells/einvn/sky130_fd_sc_hvl__einvn_1.netlist.tsv
index bdc18b9..60b155a 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn_1.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__einvn_1	A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn_1.spice b/cells/einvn/sky130_fd_sc_hvl__einvn_1.spice
index 2393850..8e6896e 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn_1.spice
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__einvn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 Z A a_413_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=4.95e+11p ps=3.66e+06u
-M1001 VGND TE_B a_30_173# VNB nhv w=420000u l=500000u
-+  ad=5.2965e+11p pd=3.04e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_437_107# a_30_173# VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1003 Z A a_437_107# VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1004 a_413_443# TE_B VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=6.658e+11p ps=4.11e+06u
-M1005 VPWR TE_B a_30_173# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
+X0 VGND a_30_173# a_437_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_30_173# TE_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 a_437_107# A Z VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VPWR TE_B a_413_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_30_173# TE_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_413_443# A Z VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp_1.cdl b/cells/einvp/sky130_fd_sc_hvl__einvp_1.cdl
index 028e534..5e12a18 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 TEB TE VNB nhv 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
-MMP0 VPWR TEB VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMN0 Z A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA TE VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 TEB TE VNB nfet_g5v0d10v5 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
+MMP0 VPWR TEB VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp_1.netlist.tsv b/cells/einvp/sky130_fd_sc_hvl__einvp_1.netlist.tsv
index 976d313..437a93f 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp_1.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__einvp_1	A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMN0	MOSFET	Z	A	sndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp_1.spice b/cells/einvp/sky130_fd_sc_hvl__einvp_1.spice
index e9865c7..36e97f3 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp_1.spice
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__einvp_1 A TE VGND VNB VPB VPWR Z
-M1000 Z A a_413_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=5.4e+11p ps=3.72e+06u
-M1001 a_413_123# TE VGND VNB nhv w=750000u l=500000u
-+  ad=2.7e+11p pd=2.22e+06u as=3.5865e+11p ps=2.76e+06u
-M1002 VPWR TE a_30_189# VPB phv w=750000u l=500000u
-+  ad=4.9875e+11p pd=3.76e+06u as=2.1375e+11p ps=2.07e+06u
-M1003 Z A a_413_123# VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1004 a_413_443# a_30_189# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND TE a_30_189# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_413_443# A Z VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_30_189# TE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 a_30_189# TE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 VGND TE a_413_123# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_413_123# A Z VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VPWR a_30_189# a_413_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_1.cdl b/cells/inv/sky130_fd_sc_hvl__inv_1.cdl
index 7229fcf..cb611b5 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_hvl__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__inv_1
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_1.netlist.tsv b/cells/inv/sky130_fd_sc_hvl__inv_1.netlist.tsv
index ac3ba5c..000fe36 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_1.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hvl__inv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__inv_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_1.spice b/cells/inv/sky130_fd_sc_hvl__inv_1.spice
index b8af050..86e2eac 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_1.spice
+++ b/cells/inv/sky130_fd_sc_hvl__inv_1.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_hvl__inv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=4.275e+11p ps=3.57e+06u
-M1001 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=2.1375e+11p ps=2.07e+06u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_16.cdl b/cells/inv/sky130_fd_sc_hvl__inv_16.cdl
index d70c2b7..5d02518 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_hvl__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phv m=16 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nhv m=16 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPB pfet_g5v0d10v5 m=16 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_g5v0d10v5 m=16 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__inv_16
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_16.netlist.tsv b/cells/inv/sky130_fd_sc_hvl__inv_16.netlist.tsv
index 9426c56..e0e8929 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_16.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hvl__inv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__inv_16	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phv	16	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nhv	16	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	16	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	16	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_16.spice b/cells/inv/sky130_fd_sc_hvl__inv_16.spice
index e4ab2da..5ba544c 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_16.spice
+++ b/cells/inv/sky130_fd_sc_hvl__inv_16.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hvl__inv_16 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=3.735e+12p pd=3.198e+07u as=3.36e+12p ps=2.848e+07u
-M1001 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=1.68e+12p pd=1.648e+07u as=1.87125e+12p ps=1.849e+07u
-M1003 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X20 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X22 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X23 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X24 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X26 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X29 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X30 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X31 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_2.cdl b/cells/inv/sky130_fd_sc_hvl__inv_2.cdl
index 75006d1..2e1b013 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_hvl__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nhv m=2 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPB pfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_g5v0d10v5 m=2 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__inv_2
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_2.netlist.tsv b/cells/inv/sky130_fd_sc_hvl__inv_2.netlist.tsv
index 8896bc7..8a1eac0 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_2.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hvl__inv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__inv_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nhv	2	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	2	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_2.spice b/cells/inv/sky130_fd_sc_hvl__inv_2.spice
index 6768f94..cd7b46a 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_2.spice
+++ b/cells/inv/sky130_fd_sc_hvl__inv_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__inv_2 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=8.55e+11p pd=7.14e+06u as=4.2e+11p ps=3.56e+06u
-M1001 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=4.275e+11p ps=4.14e+06u
-M1002 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_4.cdl b/cells/inv/sky130_fd_sc_hvl__inv_4.cdl
index afdd8fe..031278b 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_hvl__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nhv m=4 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPB pfet_g5v0d10v5 m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_g5v0d10v5 m=4 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__inv_4
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_4.netlist.tsv b/cells/inv/sky130_fd_sc_hvl__inv_4.netlist.tsv
index d665cdf..0e8487b 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_4.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hvl__inv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__inv_4	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phv	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nhv	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_4.spice b/cells/inv/sky130_fd_sc_hvl__inv_4.spice
index f58ced3..2efb24a 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_4.spice
+++ b/cells/inv/sky130_fd_sc_hvl__inv_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__inv_4 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=1.275e+12p pd=1.07e+07u as=8.4e+11p ps=7.12e+06u
-M1001 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=4.2e+11p pd=4.12e+06u as=6.375e+11p ps=6.2e+06u
-M1002 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_8.cdl b/cells/inv/sky130_fd_sc_hvl__inv_8.cdl
index 555ec93..ae972a0 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_hvl__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nhv m=8 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIP1 Y A VPB pfet_g5v0d10v5 m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_g5v0d10v5 m=8 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__inv_8
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_8.netlist.tsv b/cells/inv/sky130_fd_sc_hvl__inv_8.netlist.tsv
index fbe37c7..3473a88 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_8.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_hvl__inv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_hvl__inv_8	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phv	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nhv	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_8.spice b/cells/inv/sky130_fd_sc_hvl__inv_8.spice
index 996552d..180d120 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_8.spice
+++ b/cells/inv/sky130_fd_sc_hvl__inv_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hvl__inv_8 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=8.4e+11p pd=8.24e+06u as=1.14e+12p ps=1.054e+07u
-M1001 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=1.68e+12p pd=1.424e+07u as=2.055e+12p ps=1.774e+07u
-M1004 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.cdl b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.cdl
index 12b625d..357ba40 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.cdl
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbufhv2hv_hl_1 A LOWHVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LOWHVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nhv 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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A LOWHVPWR phv m=1 w=0.75 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 LOWHVPWR phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 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_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A LOWHVPWR pfet_g5v0d10v5 m=1 w=0.75 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 LOWHVPWR pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbufhv2hv_hl_1
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.netlist.tsv b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.netlist.tsv
index bb60c03..dec718c 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.netlist.tsv
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__lsbufhv2hv_hl_1	A:I LOWHVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	LOWHVPWR	LOWHVPWR	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	LOWHVPWR	LOWHVPWR	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	LOWHVPWR	LOWHVPWR	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	LOWHVPWR	LOWHVPWR	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.spice b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.spice
index a848f55..debdbb1 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.spice
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbufhv2hv_hl_1 A LOWHVPWR VGND VNB VPB VPWR X
-M1000 a_762_107# a_662_81# X VNB nhv w=750000u l=500000u
-+  ad=3.0405e+11p pd=2.5e+06u as=1.9875e+11p ps=2.03e+06u
-M1001 a_662_81# A LOWHVPWR LOWHVPWR phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=5.1e+11p ps=3.79e+06u
-M1002 a_662_81# A a_762_107# VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 LOWHVPWR a_662_81# X LOWHVPWR phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.275e+11p ps=3.57e+06u
+X0 X a_662_81# LOWHVPWR LOWHVPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 LOWHVPWR A a_662_81# LOWHVPWR sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_662_81# a_762_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_762_107# A a_662_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.cdl b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.cdl
index bee4c76..eea3f36 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.cdl
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbufhv2hv_lh_1 A LOWHVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LOWHVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI18 cross2 cross1 VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI18 cross2 cross1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 Abb Ab LOWHVPWR pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 X cross2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 cross1 cross2 VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 Ab A LOWHVPWR pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Abb Ab VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 X cross2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 cross2 Abb VNB nfet_g5v0d10v5 m=4 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 cross1 Ab VNB nfet_g5v0d10v5 m=4 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Ab A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 Abb Ab LOWHVPWR phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 X cross2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI19 cross1 cross2 VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab A LOWHVPWR phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Abb Ab VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 X cross2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 cross2 Abb VNB nhv m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 cross1 Ab VNB nhv m=4 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Ab A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbufhv2hv_lh_1
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.netlist.tsv b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.netlist.tsv
index a8f55a9..7cc3dab 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.netlist.tsv
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__lsbufhv2hv_lh_1	A:I LOWHVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI18	MOSFET	cross2	cross1	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Abb	Ab	LOWHVPWR	LOWHVPWR	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	X	cross2	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	cross1	cross2	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	A	LOWHVPWR	LOWHVPWR	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Abb	Ab	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	X	cross2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	cross2	Abb	VGND	VNB	nhv	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	cross1	Ab	VGND	VNB	nhv	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Ab	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	cross2	cross1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Abb	Ab	LOWHVPWR	LOWHVPWR	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	X	cross2	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	cross1	cross2	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	A	LOWHVPWR	LOWHVPWR	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Abb	Ab	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	X	cross2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	cross2	Abb	VGND	VNB	nfet_g5v0d10v5	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	cross1	Ab	VGND	VNB	nfet_g5v0d10v5	4	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.spice b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.spice
index 59728b4..63a1947 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.spice
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbufhv2hv_lh_1 A LOWHVPWR VGND VNB VPB VPWR X
-M1000 a_847_1221# a_626_141# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=8.4e+11p pd=7.12e+06u as=1.41375e+12p ps=1.265e+07u
-M1001 X a_1353_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=5.718e+11p ps=4.36e+06u
-M1002 VGND a_626_141# a_847_1221# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_1793_563# a_847_1221# a_1353_107# VPB phv w=420000u l=1e+06u
-+  ad=2.142e+11p pd=1.99e+06u as=2.142e+11p ps=1.99e+06u
-M1004 X a_1353_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1005 VPWR a_1353_107# a_847_1221# VPB phv w=420000u l=1e+06u
-+  ad=0p pd=0u as=2.142e+11p ps=1.99e+06u
-M1006 a_935_141# a_626_141# a_779_141# VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=1.425e+12p ps=1.268e+07u
-M1007 a_847_1221# a_626_141# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_779_141# a_935_141# a_1353_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.4e+11p ps=7.12e+06u
-M1009 a_935_141# a_626_141# LOWHVPWR LOWHVPWR phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=2.1e+11p ps=2.06e+06u
-M1010 a_779_141# a_935_141# a_1353_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_779_141# A a_626_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1012 a_1353_107# a_935_141# a_779_141# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_626_141# a_847_1221# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 LOWHVPWR A a_626_141# LOWHVPWR phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1015 a_1353_107# a_935_141# a_779_141# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_847_1221# a_626_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_1353_107# a_935_141# a_779_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 VPWR a_1353_107# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_847_1221# a_626_141# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_1353_107# a_847_1221# a_1793_563# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X5 a_1353_107# a_935_141# a_779_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_626_141# A LOWHVPWR LOWHVPWR sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X7 VGND a_626_141# a_847_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 VGND a_1353_107# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 a_626_141# A a_779_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X10 LOWHVPWR a_626_141# a_935_141# LOWHVPWR sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 a_779_141# a_935_141# a_1353_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X12 a_847_1221# a_1353_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X13 a_779_141# a_935_141# a_1353_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 VGND a_626_141# a_847_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 a_779_141# a_626_141# a_935_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.cdl b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.cdl
index 43d7be1..be2e603 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.cdl
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbufhv2lv_1 A LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI7 Abb Ab VPB phv 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
-MI35 cross1 cross2 LVPWR phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI7 Abb Ab VPB pfet_g5v0d10v5 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
-MI36 cross2 cross1 LVPWR phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI35 cross1 cross2 LVPWR pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 cross2 cross1 LVPWR pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 X cross2 LVPWR pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 X cross2 LVPWR phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 Ab A VPB pfet_g5v0d10v5 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
-MI27 Ab A VPB phv 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 Abb Ab VNB nhv 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
-MI21 cross2 Abb VNB nhv m=4 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI8 Abb Ab VNB nfet_g5v0d10v5 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
+MI21 cross2 Abb VNB nfet_g5v0d10v5 m=4 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 cross1 Ab VNB nfet_g5v0d10v5 m=4 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Ab A VNB nfet_g5v0d10v5 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
-MI22 cross1 Ab VNB nhv m=4 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Ab A VNB nhv 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
-MI29 X cross2 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 X cross2 VNB nfet_01v8 m=1 w=0.74 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_hvl__lsbufhv2lv_1
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.netlist.tsv b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.netlist.tsv
index 6b5efb7..4436be8 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.netlist.tsv
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__lsbufhv2lv_1	A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI7	MOSFET	Abb	Ab	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	cross1	cross2	LVPWR	LVPWR	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	cross2	cross1	LVPWR	LVPWR	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	X	cross2	LVPWR	LVPWR	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	A	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Abb	Ab	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	cross2	Abb	VGND	VNB	nhv	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	cross1	Ab	VGND	VNB	nhv	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Ab	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	X	cross2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Abb	Ab	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	cross1	cross2	LVPWR	LVPWR	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	cross2	cross1	LVPWR	LVPWR	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	X	cross2	LVPWR	LVPWR	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Abb	Ab	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	cross2	Abb	VGND	VNB	nfet_g5v0d10v5	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	cross1	Ab	VGND	VNB	nfet_g5v0d10v5	4	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	X	cross2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.spice b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.spice
index 0c5c165..4470662 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.spice
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbufhv2lv_1 A LVPWR VGND VNB VPB VPWR X
-M1000 a_30_1337# A VPWR VPB phv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.197e+11p ps=1.41e+06u
-M1001 LVPWR a_389_1337# a_389_141# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=6.104e+11p pd=5.57e+06u as=2.968e+11p ps=2.77e+06u
-M1002 a_187_207# a_30_1337# a_30_207# VNB nhv w=420000u l=500000u
-+  ad=9.54e+11p pd=8.61e+06u as=1.197e+11p ps=1.41e+06u
-M1003 LVPWR a_389_141# X LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.968e+11p ps=2.77e+06u
-M1004 a_187_207# a_30_207# a_389_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=6.075e+11p ps=6.12e+06u
-M1005 a_389_1337# a_30_1337# VGND VNB nhv w=750000u l=500000u
-+  ad=6.075e+11p pd=6.12e+06u as=7.665e+11p ps=6.61e+06u
-M1006 a_187_207# a_30_207# a_389_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_187_207# a_30_207# a_389_141# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_30_1337# a_389_1337# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_30_1337# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_389_141# a_30_207# a_187_207# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_187_207# a_389_141# X VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=1.961e+11p ps=2.01e+06u
-M1012 VGND a_30_1337# a_389_1337# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_389_1337# a_389_141# LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=2.968e+11p pd=2.77e+06u as=0p ps=0u
-M1014 a_389_1337# a_30_1337# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_30_207# a_30_1337# a_30_443# VPB phv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.197e+11p ps=1.41e+06u
+X0 a_30_207# a_30_1337# a_187_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_30_443# a_30_1337# a_30_207# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X2 X a_389_141# a_187_207# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_389_1337# a_30_1337# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_389_1337# a_30_1337# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 X a_389_141# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_389_141# a_389_1337# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_187_207# a_30_207# a_389_141# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 a_389_141# a_30_207# a_187_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 a_389_141# a_30_207# a_187_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X10 VPWR A a_30_1337# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 a_30_1337# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X12 LVPWR a_389_141# a_389_1337# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_389_141# a_30_207# a_187_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X14 VGND a_30_1337# a_389_1337# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X15 VGND a_30_1337# a_389_1337# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.cdl b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.cdl
index b6db547..aceed57 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.cdl
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbufhv2lv_simple_1 A LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nhv 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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Ab A LVPWR phv m=1 w=0.75 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 LVPWR phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMIN1 Ab A VNB nfet_g5v0d10v5 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_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A LVPWR pfet_g5v0d10v5 m=1 w=0.75 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 LVPWR pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbufhv2lv_simple_1
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.netlist.tsv b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.netlist.tsv
index 605823d..672e6c0 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.netlist.tsv
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__lsbufhv2lv_simple_1	A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	LVPWR	LVPWR	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	LVPWR	LVPWR	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	LVPWR	LVPWR	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	LVPWR	LVPWR	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.spice b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.spice
index 01be23e..5a54610 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.spice
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbufhv2lv_simple_1 A LVPWR VGND VNB VPB VPWR X
-M1000 a_762_107# a_662_81# X VNB nhv w=750000u l=500000u
-+  ad=3.0405e+11p pd=2.5e+06u as=1.9875e+11p ps=2.03e+06u
-M1001 LVPWR a_662_81# X LVPWR phv w=1.5e+06u l=500000u
-+  ad=5.1e+11p pd=3.79e+06u as=4.275e+11p ps=3.57e+06u
-M1002 a_662_81# A a_762_107# VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_662_81# A LVPWR LVPWR phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
+X0 X a_662_81# a_762_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_762_107# A a_662_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 X a_662_81# LVPWR LVPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 LVPWR A a_662_81# LVPWR sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.cdl b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.cdl
index 7b07efb..0c53eb9 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.cdl
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbuflv2hv_1 A LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI18 net81 cross1 VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI18 net81 cross1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 Abb Ab LVPWR pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net65 cross1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 X net65 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 cross1 net81 VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 Ab A LVPWR pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Abb Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 Abb Ab LVPWR phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 X net65 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net81 Abb VNB nfet_g5v0d10v5 m=5 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 cross1 Ab VNB nfet_g5v0d10v5 m=5 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net65 cross1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 X net65 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI19 cross1 net81 VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab A LVPWR phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Abb Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 X net65 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI21 net81 Abb VNB nhv m=5 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 cross1 Ab VNB nhv m=5 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Ab A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net65 cross1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 net65 cross1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbuflv2hv_1
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.netlist.tsv b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.netlist.tsv
index 9f97066..bafbfa3 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.netlist.tsv
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hvl__lsbuflv2hv_1	A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI18	MOSFET	net81	cross1	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Abb	Ab	LVPWR	LVPWR	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net65	cross1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	X	net65	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	cross1	net81	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	A	LVPWR	LVPWR	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	X	net65	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net81	Abb	VGND	VNB	nhv	5	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	cross1	Ab	VGND	VNB	nhv	5	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Ab	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net65	cross1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net81	cross1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Abb	Ab	LVPWR	LVPWR	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net65	cross1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	X	net65	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	cross1	net81	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	A	LVPWR	LVPWR	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	X	net65	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net81	Abb	VGND	VNB	nfet_g5v0d10v5	5	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	cross1	Ab	VGND	VNB	nfet_g5v0d10v5	5	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net65	cross1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.spice b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.spice
index 86c7f82..fae9ee7 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.spice
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbuflv2hv_1 A LVPWR VGND VNB VPB VPWR X
-M1000 a_1197_107# a_772_151# a_686_151# VNB nhv w=1.5e+06u l=500000u
-+  ad=1.2375e+12p pd=1.065e+07u as=1.2375e+12p ps=1.065e+07u
-M1001 X a_1711_885# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=5.988e+11p ps=5.02e+06u
-M1002 VGND a_404_1133# a_504_1221# VNB nhv w=1.5e+06u l=500000u
-+  ad=1.48125e+12p pd=1.28e+07u as=1.2375e+12p ps=1.065e+07u
-M1003 a_504_1221# a_404_1133# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 LVPWR A a_404_1133# LVPWR phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.478e+11p ps=2.27e+06u
-M1005 X a_1711_885# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1006 a_1606_563# a_1197_107# a_504_1221# VPB phv w=420000u l=1e+06u
-+  ad=2.142e+11p pd=1.99e+06u as=2.142e+11p ps=1.99e+06u
-M1007 a_1197_107# a_772_151# a_686_151# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_504_1221# a_404_1133# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1197_107# a_772_151# a_686_151# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_404_1133# a_504_1221# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_504_1221# a_404_1133# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_686_151# a_772_151# a_1197_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_504_1221# a_1711_885# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.975e+11p ps=3.53e+06u
-M1014 a_686_151# A a_404_1133# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.478e+11p ps=2.27e+06u
-M1015 a_772_151# a_404_1133# a_686_151# VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1016 VGND a_504_1221# a_1711_885# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1017 a_772_151# a_404_1133# LVPWR LVPWR phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1018 VPWR a_504_1221# a_1197_107# VPB phv w=420000u l=1e+06u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1019 a_686_151# a_772_151# a_1197_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_404_1133# a_504_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_686_151# a_772_151# a_1197_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 a_1711_885# a_504_1221# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_1711_885# a_504_1221# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_404_1133# A a_686_151# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_1711_885# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_404_1133# A LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VGND a_404_1133# a_504_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_504_1221# a_404_1133# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 a_1197_107# a_504_1221# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X10 a_686_151# a_772_151# a_1197_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X11 a_686_151# a_404_1133# a_772_151# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 LVPWR a_404_1133# a_772_151# LVPWR sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_686_151# a_772_151# a_1197_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 VGND a_404_1133# a_504_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 a_504_1221# a_1197_107# a_1606_563# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X16 a_504_1221# a_404_1133# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 VGND a_1711_885# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X18 a_1197_107# a_772_151# a_686_151# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 a_1197_107# a_772_151# a_686_151# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.cdl b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.cdl
index ade7184..bea3e10 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.cdl
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.cdl
@@ -16,42 +16,42 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3 A SLEEP_B LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MM9 t1 isolate_ahv VNB nhv 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
-MI44 t2 VGND VNB nhv 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
-MI16 t2 t3 VNB nhvnative m=4 w=1.0 l=0.9 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net065 A VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 X t8 VNB nhv m=3 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI63 t4 t3 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 t1 t4 VNB nhvnative m=4 w=1.0 l=0.9 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 isolate_ahv SLEEP_B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265
+MM9 t1 isolate_ahv VNB nfet_g5v0d10v5 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
-MI45 t8 t1 VNB nhv m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI58 t3 net065 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 t2 VGND VNB nfet_g5v0d10v5 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
+MI16 t2 t3 VNB nfet_05v0_nvt m=4 w=1.0 l=0.9 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MM3 t1 t2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MM4 t2 t1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI53 net128 isolate_ahv VPB phv m=4 w=3.0 l=0.5 mult=1 sa=0.265
+MMIN1 net065 A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 t8 t1 VPB phv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 net065 A LVPWR phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 isolate_ahv SLEEP_B VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI64 t4 t3 LVPWR phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 X t8 VNB nfet_g5v0d10v5 m=3 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 t3 net065 LVPWR phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MI63 t4 t3 VNB nfet_01v8 m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 t1 t4 VNB nfet_05v0_nvt m=4 w=1.0 l=0.9 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI35 isolate_ahv SLEEP_B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 t8 t1 VNB nfet_g5v0d10v5 m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI58 t3 net065 VNB nfet_01v8 m=4 w=0.74 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 X t8 VPB phv m=3 w=3.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MM3 t1 t2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MM4 t2 t1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI53 net128 isolate_ahv VPB pfet_g5v0d10v5 m=4 w=3.0 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 t8 t1 VPB pfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net065 A LVPWR pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 isolate_ahv SLEEP_B VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI64 t4 t3 LVPWR pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI57 t3 net065 LVPWR pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 X t8 VPB pfet_g5v0d10v5 m=3 w=3.0 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.netlist.tsv b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.netlist.tsv
index d006b68..841426e 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.netlist.tsv
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.netlist.tsv
@@ -1,21 +1,21 @@
 sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3	A:I SLEEP_B:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MM9	MOSFET	t1	isolate_ahv	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	t2	VGND	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	t2	t3	VGND	VNB	nhvnative	4	1.0	0.9	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net065	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	X	t8	VGND	VNB	nhv	3	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	t4	t3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	t1	t4	VGND	VNB	nhvnative	4	1.0	0.9	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	isolate_ahv	SLEEP_B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	t8	t1	VGND	VNB	nhv	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	t3	net065	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MM3	MOSFET	t1	t2	net128	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MM4	MOSFET	t2	t1	net128	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	net128	isolate_ahv	VPWR	VPB	phv	4	3.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	t8	t1	VPWR	VPB	phv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net065	A	LVPWR	LVPWR	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	isolate_ahv	SLEEP_B	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	t4	t3	LVPWR	LVPWR	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	t3	net065	LVPWR	LVPWR	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	X	t8	VPWR	VPB	phv	3	3.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MM9	MOSFET	t1	isolate_ahv	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	t2	VGND	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	t2	t3	VGND	VNB	nfet_05v0_nvt	4	1.0	0.9	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net065	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	X	t8	VGND	VNB	nfet_g5v0d10v5	3	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	t4	t3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	t1	t4	VGND	VNB	nfet_05v0_nvt	4	1.0	0.9	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	isolate_ahv	SLEEP_B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	t8	t1	VGND	VNB	nfet_g5v0d10v5	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	t3	net065	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MM3	MOSFET	t1	t2	net128	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MM4	MOSFET	t2	t1	net128	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	net128	isolate_ahv	VPWR	VPB	pfet_g5v0d10v5	4	3.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	t8	t1	VPWR	VPB	pfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net065	A	LVPWR	LVPWR	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	isolate_ahv	SLEEP_B	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	t4	t3	LVPWR	LVPWR	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	t3	net065	LVPWR	LVPWR	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	X	t8	VPWR	VPB	pfet_g5v0d10v5	3	3.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.spice b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.spice
index 33a9209..a6bbcf6 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.spice
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3 A SLEEP_B LVPWR VGND VNB VPB VPWR
 + X
-M1000 a_362_1243# VGND VGND VNB nhv w=420000u l=500000u
-+  ad=6.713e+11p pd=6.49e+06u as=1.79135e+12p ps=1.751e+07u
-M1001 VGND a_1472_1171# a_840_107# VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=6.713e+11p ps=6.49e+06u
-M1002 VGND a_2092_381# a_840_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_1472_1171# a_528_1171# LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=2.632e+12p ps=2.262e+07u
-M1004 VGND a_528_1171# a_362_1243# VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_262_107# X VPB phv w=3e+06u l=500000u
-+  ad=1.83375e+12p pd=1.512e+07u as=1.635e+12p ps=1.309e+07u
-M1006 a_528_1171# a_3617_1198# LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1007 a_362_133# a_528_1171# a_1472_1171# VNB nshort w=740000u l=150000u
-+  ad=6.882e+11p pd=6.3e+06u as=4.44e+11p ps=4.16e+06u
-M1008 a_362_133# a_262_107# X VNB nhv w=1e+06u l=500000u
-+  ad=8.25e+11p pd=7.65e+06u as=5.45e+11p ps=5.09e+06u
-M1009 a_1472_1171# a_528_1171# a_362_133# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_362_1243# a_528_1171# VGND VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_262_107# X VPB phv w=3e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_362_133# a_840_107# a_262_107# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=5.3e+11p ps=5.06e+06u
-M1013 LVPWR a_3617_1198# a_528_1171# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1472_1171# a_528_1171# a_362_133# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 LVPWR a_3617_1198# a_528_1171# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_362_133# a_528_1171# a_1472_1171# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1410_571# a_2092_381# a_940_485# VPB phv w=3e+06u l=500000u
-+  ad=2.1e+12p pd=1.668e+07u as=2.85e+12p ps=2.318e+07u
-M1018 VGND a_3617_1198# a_528_1171# VNB nshort w=740000u l=150000u
-+  ad=1.11e+12p pd=1.04e+07u as=4.44e+11p ps=4.16e+06u
-M1019 VGND a_3617_1198# a_528_1171# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR SLEEP_B a_2092_381# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1021 a_940_485# a_840_107# a_262_107# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=7.95e+11p ps=7.06e+06u
-M1022 a_1410_571# a_840_107# a_362_1243# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.975e+11p ps=3.53e+06u
-M1023 a_362_1243# a_528_1171# VGND VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A a_3617_1198# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1025 a_528_1171# a_3617_1198# LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1472_1171# a_528_1171# LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_528_1171# a_3617_1198# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_940_485# a_2092_381# a_1410_571# VPB phv w=3e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_840_107# a_1472_1171# VGND VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_262_107# a_362_133# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_3617_1198# A LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1032 a_840_107# a_1472_1171# VGND VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_528_1171# a_3617_1198# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_262_107# a_840_107# a_362_133# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 LVPWR a_528_1171# a_1472_1171# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_262_107# VPWR VPB phv w=3e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_940_485# a_2092_381# a_1410_571# VPB phv w=3e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 LVPWR a_528_1171# a_1472_1171# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1410_571# a_2092_381# a_940_485# VPB phv w=3e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_528_1171# a_362_1243# VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_1472_1171# a_840_107# VNB nhvnative w=1e+06u l=900000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_262_107# a_840_107# a_940_485# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_840_107# a_362_1243# a_1410_571# VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1044 LVPWR A a_3617_1198# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SLEEP_B a_2092_381# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1046 a_3617_1198# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_362_133# a_262_107# X VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_262_107# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X1 VGND a_528_1171# a_362_1243# VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X2 a_362_133# a_528_1171# a_1472_1171# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_362_1243# a_528_1171# VGND VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X4 a_362_1243# a_840_107# a_1410_571# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 a_1472_1171# a_528_1171# a_362_133# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_940_485# a_2092_381# a_1410_571# VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X7 a_1472_1171# a_528_1171# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_840_107# a_1472_1171# VGND VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X9 VGND a_1472_1171# a_840_107# VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X10 a_940_485# a_2092_381# a_1410_571# VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X11 a_528_1171# a_3617_1198# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_528_1171# a_362_1243# VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X13 X a_262_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X14 LVPWR a_3617_1198# a_528_1171# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_362_133# a_528_1171# a_1472_1171# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_1472_1171# a_528_1171# a_362_133# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_3617_1198# A LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_362_133# a_840_107# a_262_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X19 X a_262_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X20 LVPWR a_3617_1198# a_528_1171# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_528_1171# a_3617_1198# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_262_107# a_840_107# a_362_133# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X23 a_1410_571# a_2092_381# a_940_485# VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X24 a_840_107# a_2092_381# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 a_1472_1171# a_528_1171# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_362_133# a_262_107# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X27 a_840_107# a_1472_1171# VGND VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X28 VGND a_3617_1198# a_528_1171# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 LVPWR a_528_1171# a_1472_1171# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_2092_381# SLEEP_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X31 a_528_1171# a_3617_1198# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_3617_1198# a_528_1171# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 LVPWR a_528_1171# a_1472_1171# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_940_485# a_840_107# a_262_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X35 a_362_1243# a_528_1171# VGND VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X36 VGND VGND a_362_1243# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X37 VGND a_1472_1171# a_840_107# VNB sky130_fd_pr__nfet_05v0_nvt w=1e+06u l=900000u
+X38 a_2092_381# SLEEP_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X39 a_528_1171# a_3617_1198# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 a_3617_1198# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X41 LVPWR A a_3617_1198# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 VGND A a_3617_1198# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X43 X a_262_107# a_362_133# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X44 a_262_107# a_840_107# a_940_485# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X45 a_1410_571# a_362_1243# a_840_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X46 a_1410_571# a_2092_381# a_940_485# VPB sky130_fd_pr__pfet_g5v0d10v5 w=3e+06u l=500000u
+X47 X a_262_107# a_362_133# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
 .ends
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.cdl b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.cdl
index 98c5ce4..a96fdec 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.cdl
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1 A SLEEP_B LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MM8 X t1 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MM3 t1 t2 VPB phv m=1 w=0.42 l=2.0 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI7 isolate_ahv SLEEP_B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265
+MM8 X t1 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MM3 t1 t2 VPB pfet_g5v0d10v5 m=1 w=0.42 l=2.0 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 isolate_ahv SLEEP_B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 t4 t3 LVPWR pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 t4 t3 LVPWR phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 t3 A LVPWR phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MM4 t2 t1 VPB phv m=1 w=0.42 l=2.0 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MM9 t2 isolate_ahv VNB nhv m=1 w=1.0 l=0.8 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 t4 t3 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MM7 X t1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 t2 t3 VNB nhv m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI15 t1 t4 VNB nhv m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 t3 A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 isolate_ahv SLEEP_B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265
+MMIP1 t3 A LVPWR pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net54 SLEEP_B VNB nhv m=2 w=5.0 l=0.6 mult=1 sa=0.265 sb=0.265
+MM4 t2 t1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=2.0 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MM9 t2 isolate_ahv VNB nfet_g5v0d10v5 m=1 w=1.0 l=0.8 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 t4 t3 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MM7 X t1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 t2 t3 VNB nfet_g5v0d10v5 m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 t1 t4 VNB nfet_g5v0d10v5 m=2 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 t3 A VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 isolate_ahv SLEEP_B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net54 SLEEP_B VNB nfet_g5v0d10v5 m=2 w=5.0 l=0.6 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.netlist.tsv b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.netlist.tsv
index 4fe344a..ad45de5 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.netlist.tsv
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1	A:I SLEEP_B:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MM8	MOSFET	X	t1	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MM3	MOSFET	t1	t2	VPWR	VPB	phv	1	0.42	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	isolate_ahv	SLEEP_B	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	t4	t3	LVPWR	LVPWR	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	t3	A	LVPWR	LVPWR	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MM4	MOSFET	t2	t1	VPWR	VPB	phv	1	0.42	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MM9	MOSFET	t2	isolate_ahv	VGND	VNB	nhv	1	1.0	0.8	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	t4	t3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MM7	MOSFET	X	t1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	t2	t3	net54	VNB	nhv	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	t1	t4	net54	VNB	nhv	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	t3	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	isolate_ahv	SLEEP_B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net54	SLEEP_B	VGND	VNB	nhv	2	5.0	0.6	1	0.265	0.265	0.28	normal	0.063	1.14
+MM8	MOSFET	X	t1	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MM3	MOSFET	t1	t2	VPWR	VPB	pfet_g5v0d10v5	1	0.42	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	isolate_ahv	SLEEP_B	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	t4	t3	LVPWR	LVPWR	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	t3	A	LVPWR	LVPWR	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MM4	MOSFET	t2	t1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MM9	MOSFET	t2	isolate_ahv	VGND	VNB	nfet_g5v0d10v5	1	1.0	0.8	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	t4	t3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MM7	MOSFET	X	t1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	t2	t3	net54	VNB	nfet_g5v0d10v5	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	t1	t4	net54	VNB	nfet_g5v0d10v5	2	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	t3	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	isolate_ahv	SLEEP_B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net54	SLEEP_B	VGND	VNB	nfet_g5v0d10v5	2	5.0	0.6	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.spice b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.spice
index cac4a8f..83ad460 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.spice
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.spice
@@ -17,38 +17,21 @@
 
 .subckt sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1 A SLEEP_B LVPWR VGND VNB VPB VPWR
 + X
-M1000 a_241_1225# A a_341_183# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.627e+11p ps=2.19e+06u
-M1001 a_188_1293# a_241_1225# a_176_993# VNB nhv w=1e+06u l=500000u
-+  ad=3.46e+12p pd=2.868e+07u as=5.45e+11p ps=5.09e+06u
-M1002 LVPWR a_241_1225# a_553_1225# LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=7.728e+11p pd=5.86e+06u as=3.304e+11p ps=2.83e+06u
-M1003 a_188_1293# SLEEP_B a_341_183# VNB nhv w=5e+06u l=600000u
-+  ad=0p pd=0u as=1.92e+12p ps=1.527e+07u
-M1004 a_188_1293# a_553_1225# a_229_967# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1005 a_176_993# a_241_1225# a_188_1293# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_229_967# a_176_993# a_341_485# VPB phv w=420000u l=2e+06u
-+  ad=1.113e+11p pd=1.37e+06u as=7.1385e+11p ps=6.96e+06u
-M1007 a_341_485# a_229_967# X VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1008 a_341_183# a_507_107# a_176_993# VNB nhv w=1e+06u l=800000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_241_1225# a_553_1225# VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=2.109e+11p ps=2.05e+06u
-M1010 a_341_183# a_229_967# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1011 a_507_107# SLEEP_B a_341_183# VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1012 a_229_967# a_553_1225# a_188_1293# VNB nhv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_241_1225# A LVPWR LVPWR phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1014 a_341_485# a_229_967# a_176_993# VPB phv w=420000u l=2e+06u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 a_507_107# SLEEP_B a_341_485# VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1016 a_341_183# SLEEP_B a_188_1293# VNB nhv w=5e+06u l=600000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_176_993# a_229_967# a_341_485# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=2e+06u
+X1 a_341_183# SLEEP_B a_507_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_229_967# a_341_485# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X3 a_188_1293# a_553_1225# a_229_967# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X4 a_341_183# A a_241_1225# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_188_1293# a_241_1225# a_176_993# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X6 a_341_485# SLEEP_B a_507_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 a_188_1293# SLEEP_B a_341_183# VNB sky130_fd_pr__nfet_g5v0d10v5 w=5e+06u l=600000u
+X8 a_553_1225# a_241_1225# LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_553_1225# a_241_1225# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_341_183# SLEEP_B a_188_1293# VNB sky130_fd_pr__nfet_g5v0d10v5 w=5e+06u l=600000u
+X11 a_176_993# a_241_1225# a_188_1293# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
+X12 a_341_485# a_176_993# a_229_967# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=2e+06u
+X13 X a_229_967# a_341_183# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X14 a_176_993# a_507_107# a_341_183# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=800000u
+X15 LVPWR A a_241_1225# LVPWR sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_229_967# a_553_1225# a_188_1293# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1e+06u l=500000u
 .ends
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.cdl b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.cdl
index 409f911..cc6305c 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.cdl
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1 A LVPWR VGND VNB VPB VPWR X
 *.PININFO A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI33 cross2 X_n VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI33 cross2 X_n VPB pfet_g5v0d10v5 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
+MI31 cross1 X_n VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 cross2 cross1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=1.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 Abb Ab LVPWR pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 X_n cross1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 X X_n VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 cross1 X_n VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI19 cross1 cross2 VPB pfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 Ab A LVPWR pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 Abb Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 cross2 cross1 VPB phv m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI16 X X_n VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net81 Abb VNB nfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 cross1 Ab VNB nfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 cross2 X_n VNB nfet_g5v0d10v5 m=2 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 Abb Ab LVPWR phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 X_n cross1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 X X_n VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI19 cross1 cross2 VPB phv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab A LVPWR phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Abb Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 X X_n VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI21 net81 Abb VNB nhv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 cross1 Ab VNB nhv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 cross2 X_n VNB nhv m=2 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Ab A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 X_n cross1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 X_n cross1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.netlist.tsv b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.netlist.tsv
index 45c606a..f46439f 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.netlist.tsv
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1	A:I LVPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI33	MOSFET	cross2	X_n	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	cross1	X_n	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	cross2	cross1	VPWR	VPB	phv	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Abb	Ab	LVPWR	LVPWR	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	X_n	cross1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	X	X_n	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	cross1	cross2	VPWR	VPB	phv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	A	LVPWR	LVPWR	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	X	X_n	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net81	Abb	VGND	VNB	nhv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	cross1	Ab	VGND	VNB	nhv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	cross2	X_n	net81	VNB	nhv	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Ab	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	X_n	cross1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	cross2	X_n	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	cross1	X_n	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	cross2	cross1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Abb	Ab	LVPWR	LVPWR	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	X_n	cross1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	X	X_n	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	cross1	cross2	VPWR	VPB	pfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	A	LVPWR	LVPWR	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	X	X_n	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net81	Abb	VGND	VNB	nfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	cross1	Ab	VGND	VNB	nfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	cross2	X_n	net81	VNB	nfet_g5v0d10v5	2	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	X_n	cross1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.spice b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.spice
index 2d746d7..4490ace 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.spice
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.spice
@@ -16,42 +16,23 @@
 
 
 .subckt sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1 A LVPWR VGND VNB VPB VPWR X
-M1000 a_1197_107# a_772_151# a_686_151# VNB nhv w=1.5e+06u l=500000u
-+  ad=1.215e+12p pd=1.062e+07u as=7.95e+11p ps=7.06e+06u
-M1001 VGND a_573_897# a_816_1221# VNB nhv w=1.5e+06u l=500000u
-+  ad=1.03875e+12p pd=9.21e+06u as=4.2e+11p ps=3.56e+06u
-M1002 a_1400_777# a_816_1221# a_1606_563# VPB phv w=420000u l=1e+06u
-+  ad=2.457e+11p pd=2.14e+06u as=4.599e+11p ps=4.13e+06u
-M1003 a_1606_563# a_1406_429# a_1400_777# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_816_1221# a_573_897# VGND VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 LVPWR A a_573_897# LVPWR phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.478e+11p ps=2.27e+06u
-M1006 a_1606_563# a_1406_429# a_816_1221# VPB phv w=420000u l=1e+06u
-+  ad=0p pd=0u as=1.0092e+12p ps=9.05e+06u
-M1007 X a_1406_429# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1008 VPWR a_1400_777# a_816_1221# VPB phv w=1.5e+06u l=500000u
-+  ad=9.75e+11p pd=7.3e+06u as=0p ps=0u
-M1009 a_816_1221# a_1400_777# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1197_107# a_1406_429# a_1400_777# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.2e+11p ps=3.56e+06u
-M1011 VGND a_816_1221# a_1406_429# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1012 a_686_151# a_772_151# a_1197_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_816_1221# a_1406_429# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.975e+11p ps=3.53e+06u
-M1014 X a_1406_429# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1015 a_686_151# A a_573_897# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.478e+11p ps=2.27e+06u
-M1016 a_772_151# a_573_897# a_686_151# VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1017 a_772_151# a_573_897# LVPWR LVPWR phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1018 a_1400_777# a_1406_429# a_1197_107# VNB nhv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1400_777# a_1406_429# a_1197_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND a_1406_429# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_1406_429# a_816_1221# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_573_897# A a_686_151# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_573_897# A LVPWR LVPWR sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_1606_563# a_816_1221# a_1400_777# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X6 VGND a_573_897# a_816_1221# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 a_816_1221# a_1400_777# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_816_1221# a_573_897# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 a_686_151# a_573_897# a_772_151# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 LVPWR a_573_897# a_772_151# LVPWR sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 a_686_151# a_772_151# a_1197_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X12 a_816_1221# a_1406_429# a_1606_563# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=1e+06u
+X13 VPWR a_1400_777# a_816_1221# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 VPWR a_1406_429# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 a_1406_429# a_816_1221# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X16 a_1197_107# a_772_151# a_686_151# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
+X17 a_1400_777# a_1406_429# a_1606_563# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 a_1197_107# a_1406_429# a_1400_777# VNB sky130_fd_pr__nfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2_1.cdl b/cells/mux2/sky130_fd_sc_hvl__mux2_1.cdl
index d647844..6447d18 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv 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
-MMNA01 smdNA0 Sb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_g5v0d10v5 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
+MMNA01 smdNA0 Sb VNB nfet_g5v0d10v5 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
+MMNA10 xb A1 VNB nfet_g5v0d10v5 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
+MMNA11 sndNA1 S VNB nfet_g5v0d10v5 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
+MMIN1 Sb S VNB nfet_g5v0d10v5 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 xb VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_g5v0d10v5 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
+MMPA01 sndPS A0 VPB pfet_g5v0d10v5 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
+MMPA10 VPWR Sb VPB pfet_g5v0d10v5 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
+MMPA11 sndPSb A1 VPB pfet_g5v0d10v5 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
+MMIP1 Sb S VPB pfet_g5v0d10v5 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 xb VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nhv 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
-MMNA11 sndNA1 S VNB nhv 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
-MMIN1 Sb S VNB nhv 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 xb VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phv 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
-MMPA01 sndPS A0 VPB phv 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
-MMPA10 VPWR Sb VPB phv 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
-MMPA11 sndPSb A1 VPB phv 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
-MMIP1 Sb S VPB phv 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 xb VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2_1.netlist.tsv b/cells/mux2/sky130_fd_sc_hvl__mux2_1.netlist.tsv
index 6bf3dd2..f04660d 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2_1.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_hvl__mux2_1	A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2_1.spice b/cells/mux2/sky130_fd_sc_hvl__mux2_1.spice
index 112186f..76c8c6a 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2_1.spice
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_hvl__mux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_671_491# A1 a_94_81# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_373_107# S VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.7755e+11p ps=3.69e+06u
-M1002 VPWR a_94_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=5.913e+11p pd=5.19e+06u as=4.275e+11p ps=3.57e+06u
-M1003 VGND a_713_81# a_671_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_373_491# S VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VPWR a_713_81# a_671_491# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_94_81# A1 a_373_107# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_94_81# A0 a_373_491# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_713_81# S VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1009 VGND a_94_81# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1010 a_713_81# S VPWR VPB phv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1011 a_671_107# A0 a_94_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_94_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_671_107# a_713_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_373_491# A0 a_94_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X3 X a_94_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_373_107# A1 a_94_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_94_81# A1 a_671_491# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 a_94_81# A0 a_671_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 VPWR S a_373_491# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR S a_713_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X9 a_671_491# a_713_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X10 VGND S a_373_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 VGND S a_713_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4_1.cdl b/cells/mux4/sky130_fd_sc_hvl__mux4_1.cdl
index a809c62..34388d0 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4_1.cdl
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4_1.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_hvl__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 sndNS0ba0 S0b VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB phv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP4 VPWR xb VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
+MMNA00 sndNS0ba0 S0b VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA01 VGND A0 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA10 sndNS0a1 S0 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA11 VGND A1 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA20 sndNS0ba2 S0b VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA21 VGND A2 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA30 sndNS0a3 S0 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNA31 VGND A3 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNs1o xb S1b VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMNs2o xb S1 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN1 VGND S1 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN2 VGND S0 VNB nfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIN4 VGND xb VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA30 sndPA3a3 A3 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs2o xb S1b VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP1 VPWR S1 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP2 VPWR S0 VPB pfet_g5v0d10v5 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP4 VPWR xb VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_hvl__mux4_1
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4_1.netlist.tsv b/cells/mux4/sky130_fd_sc_hvl__mux4_1.netlist.tsv
index d7d54a4..ee93334 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4_1.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4_1.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_hvl__mux4_1	A0:I A1:I A2:I A3:I S0:I S1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4_1.spice b/cells/mux4/sky130_fd_sc_hvl__mux4_1.spice
index b6ae893..3a82db5 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4_1.spice
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4_1.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_hvl__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_339_627# A2 VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=9.711e+11p ps=8.19e+06u
-M1001 a_1097_627# a_30_107# a_955_627# VPB phv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND A3 a_637_107# VNB nhv w=420000u l=500000u
-+  ad=7.5555e+11p pd=7.17e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1669_615# S1 a_1097_627# VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_983_107# A1 VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_481_107# S1 a_1669_615# VNB nhv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=1.176e+11p ps=1.4e+06u
-M1006 a_339_107# A2 VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_481_107# a_30_107# a_339_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A0 a_1281_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 VPWR A3 a_637_627# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1010 VGND S1 a_1681_89# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_1669_615# a_1681_89# a_1097_627# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1012 a_1097_627# S0 a_983_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S0 a_30_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VPWR S1 a_1681_89# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 X a_1669_615# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1016 a_637_627# a_30_107# a_481_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=3.927e+11p ps=3.55e+06u
-M1017 a_481_107# a_1681_89# a_1669_615# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1253_627# S0 a_1097_627# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1019 VPWR A0 a_1253_627# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND S0 a_30_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1021 a_1281_107# a_30_107# a_1097_627# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_1669_615# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1023 a_481_107# S0 a_339_627# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_955_627# A1 VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_637_107# S0 a_481_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_107# S0 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_30_107# S0 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X2 a_1097_627# a_1681_89# a_1669_615# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_1281_107# A0 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_955_627# a_30_107# a_1097_627# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 a_481_107# S0 a_637_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 a_1253_627# A0 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X7 a_983_107# S0 a_1097_627# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 VGND a_1669_615# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 a_481_107# a_30_107# a_637_627# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X10 a_637_627# A3 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 VPWR a_1669_615# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X12 a_1097_627# S1 a_1669_615# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X13 a_1681_89# S1 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 VGND A2 a_339_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 a_339_107# a_30_107# a_481_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 VGND A1 a_983_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VPWR A1 a_955_627# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 VPWR A2 a_339_627# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 a_1669_615# a_1681_89# a_481_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 a_1097_627# a_30_107# a_1281_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X21 a_339_627# S0 a_481_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X22 a_1097_627# S0 a_1253_627# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 a_1681_89# S1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X24 a_637_107# A3 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 a_1669_615# S1 a_481_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2_1.cdl b/cells/nand2/sky130_fd_sc_hvl__nand2_1.cdl
index 842cbe7..17e65ba 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 Y A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2_1.netlist.tsv b/cells/nand2/sky130_fd_sc_hvl__nand2_1.netlist.tsv
index 4b4ac21..180e7ab 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2_1.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__nand2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2_1.spice b/cells/nand2/sky130_fd_sc_hvl__nand2_1.spice
index f319c73..b0f0468 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2_1.spice
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__nand2_1 A B VGND VNB VPB VPWR Y
-M1000 a_233_111# B VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=2.1375e+11p ps=2.07e+06u
-M1001 Y A a_233_111# VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1002 VPWR A Y VPB phv w=1.5e+06u l=500000u
-+  ad=8.55e+11p pd=7.14e+06u as=4.2e+11p ps=3.56e+06u
-M1003 Y B VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND B a_233_111# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_233_111# A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3_1.cdl b/cells/nand3/sky130_fd_sc_hvl__nand3_1.cdl
index dc2a734..e97e36e 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 Y C VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 Y A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 Y B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 Y C VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3_1.netlist.tsv b/cells/nand3/sky130_fd_sc_hvl__nand3_1.netlist.tsv
index 3ca09da..7fdedb0 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3_1.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__nand3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	Y	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3_1.spice b/cells/nand3/sky130_fd_sc_hvl__nand3_1.spice
index dfb6965..72eb8e7 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3_1.spice
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__nand3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=8.475e+11p pd=7.13e+06u as=1.1775e+12p ps=7.57e+06u
-M1001 Y C VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_243_107# C VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=2.1375e+11p ps=2.07e+06u
-M1003 a_385_107# B a_243_107# VNB nhv w=750000u l=500000u
-+  ad=3.15e+11p pd=2.34e+06u as=0p ps=0u
-M1004 VPWR B Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_385_107# VNB nhv w=750000u l=500000u
-+  ad=2.175e+11p pd=2.08e+06u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND C a_243_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_385_107# A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_243_107# B a_385_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2_1.cdl b/cells/nor2/sky130_fd_sc_hvl__nor2_1.cdl
index bc89fe3..e35b359 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 VPWR A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2_1.netlist.tsv b/cells/nor2/sky130_fd_sc_hvl__nor2_1.netlist.tsv
index 0a08214..82b39ae 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2_1.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_hvl__nor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2_1.spice b/cells/nor2/sky130_fd_sc_hvl__nor2_1.spice
index 98fa936..90ff8e0 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2_1.spice
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_hvl__nor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_251_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=4.275e+11p ps=3.57e+06u
-M1001 Y B a_251_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1002 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=4.275e+11p ps=4.14e+06u
-M1003 VGND B Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_251_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_251_443# B Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3_1.cdl b/cells/nor3/sky130_fd_sc_hvl__nor3_1.cdl
index 290769c..3d8d105 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 VPWR A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 Y B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 Y C VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3_1.netlist.tsv b/cells/nor3/sky130_fd_sc_hvl__nor3_1.netlist.tsv
index 4932a30..4b143a6 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3_1.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__nor3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3_1.spice b/cells/nor3/sky130_fd_sc_hvl__nor3_1.spice
index 86c8679..60600ca 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3_1.spice
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__nor3_1 A B C VGND VNB VPB VPWR Y
-M1000 a_205_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=4.275e+11p ps=3.57e+06u
-M1001 a_347_443# B a_205_443# VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=0p ps=0u
-M1002 Y C a_347_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1003 Y A VGND VNB nhv w=750000u l=500000u
-+  ad=4.0875e+11p pd=4.09e+06u as=4.0875e+11p ps=4.09e+06u
-M1004 Y C VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_347_443# C Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_205_443# B a_347_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 VGND C Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VPWR A a_205_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a_1.cdl b/cells/o21a/sky130_fd_sc_hvl__o21a_1.cdl
index 808a662..ec31dd6 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMINX X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a_1.netlist.tsv b/cells/o21a/sky130_fd_sc_hvl__o21a_1.netlist.tsv
index 56bd641..ac00740 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a_1.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__o21a_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a_1.spice b/cells/o21a/sky130_fd_sc_hvl__o21a_1.spice
index e28614c..86d631c 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a_1.spice
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND a_83_87# X VNB nhv w=750000u l=500000u
-+  ad=4.3875e+11p pd=4.17e+06u as=1.9875e+11p ps=2.03e+06u
-M1001 a_602_443# A2 a_83_87# VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=5.4e+11p ps=3.72e+06u
-M1002 VPWR a_83_87# X VPB phv w=1.5e+06u l=500000u
-+  ad=1.1775e+12p pd=7.57e+06u as=4.275e+11p ps=3.57e+06u
-M1003 VGND A2 a_460_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=4.2375e+11p ps=4.13e+06u
-M1004 a_460_107# A1 VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_460_107# B1 a_83_87# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1006 a_83_87# B1 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_602_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_87# A2 a_602_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_460_107# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_83_87# B1 a_460_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 X a_83_87# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 VGND A1 a_460_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 X a_83_87# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_602_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 VPWR B1 a_83_87# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.cdl
index b96a1c6..abc6853 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMPA0 VPWR A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.netlist.tsv b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.netlist.tsv
index f3f0bb6..9719586 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__o21ai_1	A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.spice b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.spice
index 6f3eaa7..3eb7f1b 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.spice
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_205_443# A1 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=8.55e+11p ps=7.14e+06u
-M1001 Y A2 a_205_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=0p ps=0u
-M1002 Y B1 a_30_107# VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=4.2375e+11p ps=4.13e+06u
-M1003 VGND A1 a_30_107# VNB nhv w=750000u l=500000u
-+  ad=2.25e+11p pd=2.1e+06u as=0p ps=0u
-M1004 a_30_107# A2 VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B1 Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_107# A1 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 VGND A2 a_30_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_205_443# A2 Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_30_107# B1 Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 Y B1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VPWR A1 a_205_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a_1.cdl b/cells/o22a/sky130_fd_sc_hvl__o22a_1.cdl
index 4201b90..ffdd5b2 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 y B2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMINX X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a_1.netlist.tsv b/cells/o22a/sky130_fd_sc_hvl__o22a_1.netlist.tsv
index da681d5..6a70c91 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a_1.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__o22a_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a_1.spice b/cells/o22a/sky130_fd_sc_hvl__o22a_1.spice
index 68c5ab1..5e52961 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a_1.spice
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_87_81# B2 a_533_443# VPB phv w=1.5e+06u l=500000u
-+  ad=4.2e+11p pd=3.56e+06u as=3.15e+11p ps=3.42e+06u
-M1001 VGND A2 a_354_107# VNB nhv w=750000u l=500000u
-+  ad=4.65e+11p pd=4.24e+06u as=4.2e+11p ps=4.12e+06u
-M1002 a_87_81# B1 a_354_107# VNB nhv w=750000u l=500000u
-+  ad=2.4375e+11p pd=2.15e+06u as=0p ps=0u
-M1003 VGND a_87_81# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1004 a_354_107# B2 a_87_81# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_831_443# A2 a_87_81# VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=0p ps=0u
-M1006 VPWR A1 a_831_443# VPB phv w=1.5e+06u l=500000u
-+  ad=2.2425e+12p pd=8.99e+06u as=0p ps=0u
-M1007 a_354_107# A1 VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_87_81# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.275e+11p ps=3.57e+06u
-M1009 a_533_443# B1 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_354_107# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_87_81# A2 a_831_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 X a_87_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VGND A1 a_354_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_87_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 VPWR B1 a_533_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_354_107# B1 a_87_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_831_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_87_81# B2 a_354_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 a_533_443# B2 a_87_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.cdl
index ef95b59..d019f40 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB1 Y B2 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMPA0 VPWR A1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA1 pndA A2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 Y B2 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.netlist.tsv b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.netlist.tsv
index 8acfd36..089fd98 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__o22ai_1	A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMPA0	MOSFET	VPWR	A1	sndA1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.spice b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.spice
index ac67887..04adcb0 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.spice
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_36_113# VNB nhv w=750000u l=500000u
-+  ad=2.85e+11p pd=2.26e+06u as=6.375e+11p ps=6.2e+06u
-M1001 a_36_113# B2 Y VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.06e+06u
-M1002 a_207_443# B1 VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=8.55e+11p ps=7.14e+06u
-M1003 Y B2 a_207_443# VPB phv w=1.5e+06u l=500000u
-+  ad=5.325e+11p pd=3.71e+06u as=0p ps=0u
-M1004 a_520_443# A2 Y VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=0p ps=0u
-M1005 VPWR A1 a_520_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_36_113# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_36_113# A1 VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_207_443# B2 Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_520_443# A1 VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 Y B2 a_36_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 VGND A1 a_36_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 VPWR B1 a_207_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X5 a_36_113# A2 VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 a_36_113# B1 Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 Y A2 a_520_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_hvl__or2_1.cdl b/cells/or2/sky130_fd_sc_hvl__or2_1.cdl
index d6f4df6..5da5084 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_hvl__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv 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
-MMP1 sndPA B VPB phv 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 y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nhv 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
-MMN1 y B VNB nhv 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 y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 VPWR A VPB pfet_g5v0d10v5 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
+MMP1 sndPA B VPB pfet_g5v0d10v5 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 y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_g5v0d10v5 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
+MMN1 y B VNB nfet_g5v0d10v5 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 y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__or2_1
diff --git a/cells/or2/sky130_fd_sc_hvl__or2_1.netlist.tsv b/cells/or2/sky130_fd_sc_hvl__or2_1.netlist.tsv
index 57074b9..9d98f30 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2_1.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_hvl__or2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_hvl__or2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_hvl__or2_1.spice b/cells/or2/sky130_fd_sc_hvl__or2_1.spice
index b5c4ea7..dc4f4be 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2_1.spice
+++ b/cells/or2/sky130_fd_sc_hvl__or2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_hvl__or2_1 A B VGND VNB VPB VPWR X
-M1000 X a_84_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=5.22e+11p ps=4.02e+06u
-M1001 a_241_443# B a_84_443# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VPWR A a_241_443# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A a_84_443# VNB nhv w=420000u l=500000u
-+  ad=3.9855e+11p pd=3.79e+06u as=1.176e+11p ps=1.4e+06u
-M1004 X a_84_443# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1005 a_84_443# B VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_84_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 a_241_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X2 a_84_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 VGND B a_84_443# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_84_443# B a_241_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 VGND a_84_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_hvl__or3_1.cdl b/cells/or3/sky130_fd_sc_hvl__or3_1.cdl
index 8c50e32..c99495f 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_hvl__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 phv 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
-MMP1 sndPA B VPB phv 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
-MMP2 sndPB C VPB phv 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
-MMIP3 X y VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nhv 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
-MMN1 y B VNB nhv 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
-MMN2 y C VNB nhv 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
-MMIN3 X y VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MMP0 VPWR A VPB pfet_g5v0d10v5 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
+MMP1 sndPA B VPB pfet_g5v0d10v5 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
+MMP2 sndPB C VPB pfet_g5v0d10v5 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
+MMIP3 X y VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_g5v0d10v5 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
+MMN1 y B VNB nfet_g5v0d10v5 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
+MMN2 y C VNB nfet_g5v0d10v5 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
+MMIN3 X y VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__or3_1
diff --git a/cells/or3/sky130_fd_sc_hvl__or3_1.netlist.tsv b/cells/or3/sky130_fd_sc_hvl__or3_1.netlist.tsv
index 8931409..ec04233 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3_1.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_hvl__or3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_hvl__or3_1	A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMP0	MOSFET	VPWR	A	sndPA	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_hvl__or3_1.spice b/cells/or3/sky130_fd_sc_hvl__or3_1.spice
index cb88203..f878fa8 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3_1.spice
+++ b/cells/or3/sky130_fd_sc_hvl__or3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_hvl__or3_1 A B C VGND VNB VPB VPWR X
-M1000 X a_30_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=5.136e+11p ps=3.98e+06u
-M1001 VGND A a_30_107# VNB nhv w=420000u l=500000u
-+  ad=4.0065e+11p pd=3.8e+06u as=2.289e+11p ps=2.77e+06u
-M1002 a_190_464# C a_30_107# VPB phv w=420000u l=500000u
-+  ad=1.071e+11p pd=1.35e+06u as=1.197e+11p ps=1.41e+06u
-M1003 X a_30_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1004 a_30_107# B VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_341_464# B a_190_464# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VPWR A a_341_464# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_30_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_30_107# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 VPWR a_30_107# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 a_30_107# C VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_30_107# C a_190_464# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 a_341_464# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 a_30_107# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND B a_30_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_190_464# B a_341_464# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.cdl b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.cdl
index b4288eb..d6b477d 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.cdl
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.cdl
@@ -17,12 +17,12 @@
 .SUBCKT sky130_fd_sc_hvl__probe_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
 rI112 net23 X short
-MMIN1 Ab A VNB nhv m=3 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 net23 Ab VNB nhv m=8 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=3 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net23 Ab VNB nfet_g5v0d10v5 m=8 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=3 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=3 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP2 net23 Ab VPB phv m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 net23 Ab VPB pfet_g5v0d10v5 m=8 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__probe_p_8
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.netlist.tsv b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.netlist.tsv
index e2512b4..ec428d2 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.netlist.tsv
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.netlist.tsv
@@ -1,7 +1,7 @@
 sky130_fd_sc_hvl__probe_p_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
 rI112	net23 X short
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net23	Ab	VGND	VNB	nhv	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net23	Ab	VPWR	VPB	phv	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net23	Ab	VGND	VNB	nfet_g5v0d10v5	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net23	Ab	VPWR	VPB	pfet_g5v0d10v5	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.spice b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.spice
index 4b66a99..2822ad2 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.spice
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hvl__probe_p_8 A VGND VNB VPB VPWR X
-M1000 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=1.68e+12p pd=1.424e+07u as=2.9175e+12p ps=2.189e+07u
-M1001 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=8.4e+11p pd=8.24e+06u as=1.45875e+12p ps=1.289e+07u
-M1002 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_45_443# A VGND VNB nhv w=750000u l=500000u
-+  ad=4.2375e+11p pd=4.13e+06u as=0p ps=0u
-M1004 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.475e+11p ps=7.13e+06u
-M1007 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_45_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VGND A a_45_443# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X10 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X11 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X13 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 VPWR A a_45_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X16 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X17 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X18 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X20 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.cdl b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.cdl
index b0966a0..155859f 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.cdl
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.cdl
@@ -17,12 +17,12 @@
 .SUBCKT sky130_fd_sc_hvl__probec_p_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
 rI112 net34 X short
-MMIN1 Ab A VNB nhv m=3 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 net34 Ab VNB nhv m=8 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_g5v0d10v5 m=3 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net34 Ab VNB nfet_g5v0d10v5 m=8 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_g5v0d10v5 m=3 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phv m=3 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP2 net34 Ab VPB phv m=8 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 net34 Ab VPB pfet_g5v0d10v5 m=8 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__probec_p_8
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.netlist.tsv b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.netlist.tsv
index ba22d64..4511196 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.netlist.tsv
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.netlist.tsv
@@ -1,7 +1,7 @@
 sky130_fd_sc_hvl__probec_p_8	A:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
 rI112	net34 X short
-MMIN1	MOSFET	Ab	A	VGND	VNB	nhv	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net34	Ab	VGND	VNB	nhv	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phv	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net34	Ab	VPWR	VPB	phv	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_g5v0d10v5	3	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net34	Ab	VGND	VNB	nfet_g5v0d10v5	8	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_g5v0d10v5	3	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net34	Ab	VPWR	VPB	pfet_g5v0d10v5	8	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.spice b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.spice
index 4b12821..563dc3e 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.spice
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hvl__probec_p_8 A VGND VNB VPB VPWR X
-M1000 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=1.68e+12p pd=1.424e+07u as=2.9175e+12p ps=2.189e+07u
-M1001 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=8.4e+11p pd=8.24e+06u as=1.45875e+12p ps=1.289e+07u
-M1002 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_45_443# A VGND VNB nhv w=750000u l=500000u
-+  ad=4.2375e+11p pd=4.13e+06u as=0p ps=0u
-M1004 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=8.475e+11p ps=7.13e+06u
-M1007 VPWR A a_45_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_45_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_45_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_45_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_45_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_45_443# X VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_45_443# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 VGND A a_45_443# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X10 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X11 VGND a_45_443# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X12 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X13 X a_45_443# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X14 a_45_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X15 VPWR A a_45_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X16 a_45_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X17 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X18 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X19 X a_45_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X20 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 VPWR a_45_443# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.cdl b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.cdl
index 984ef6a..4fb7bef 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.cdl
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.cdl
@@ -18,20 +18,20 @@
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
 rI39 net069 VGND mrdn_hv m=1 w=0.29 l=1.355 isHV=TRUE
 rI38 VPWR net32 mrdp_hv m=1 w=0.29 l=3.11 isHV=TRUE
-MI5 net32 net36 VNB nhv 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
-MMN0 net36 A VNB nhv 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
-MMN1 net40 A VNB nhv 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
-MMIN1 X net36 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net069 net36 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR A VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 net56 A VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 X net36 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
+MI5 net32 net36 VNB nfet_g5v0d10v5 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
+MMN0 net36 A VNB nfet_g5v0d10v5 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
+MMN1 net40 A VNB nfet_g5v0d10v5 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
+MMIN1 X net36 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net069 net36 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR A VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 net56 A VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X net36 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__schmittbuf_1
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.netlist.tsv b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.netlist.tsv
index d97216c..9b83891 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.netlist.tsv
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.netlist.tsv
@@ -2,11 +2,11 @@
 Name	Formula				m	w	l	isHV	nd	ng	ns	nb	mname	mult	sa	sb	sd	topography	area	perim
 rI39	RESISTOR	net069	VGND	mrdn_hv	1	0.29	1.355	TRUE												
 rI38	RESISTOR	VPWR	net32	mrdp_hv	1	0.29	3.11	TRUE												
-MI5	MOSFET				1	0.42	0.5		net32	net36	net40	VNB	nhv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET				1	0.42	0.5		net36	A	net40	VNB	nhv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET				1	0.42	0.5		net40	A	VGND	VNB	nhv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET				1	0.75	0.5		X	net36	VGND	VNB	nhv	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET				1	0.75	0.5		net069	net36	net56	VPB	phv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET				1	0.75	0.5		VPWR	A	net56	VPB	phv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET				1	0.75	0.5		net56	A	net36	VPB	phv	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET				1	1.5	0.5		X	net36	VPWR	VPB	phv	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET				1	0.42	0.5		net32	net36	net40	VNB	nfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET				1	0.42	0.5		net36	A	net40	VNB	nfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET				1	0.42	0.5		net40	A	VGND	VNB	nfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET				1	0.75	0.5		X	net36	VGND	VNB	nfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET				1	0.75	0.5		net069	net36	net56	VPB	pfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET				1	0.75	0.5		VPWR	A	net56	VPB	pfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET				1	0.75	0.5		net56	A	net36	VPB	pfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET				1	1.5	0.5		X	net36	VPWR	VPB	pfet_g5v0d10v5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.spice b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.spice
index 70465b2..a4fa10a 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.spice
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.spice
@@ -16,22 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__schmittbuf_1 A VGND VNB VPB VPWR X
-R0 a_78_463# VGND mrdn_hv w=290000u l=1.355e+06u
-M1000 X a_117_181# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=9.478e+11p ps=4.36e+06u
-R1 a_64_207# VPWR mrdp_hv w=290000u l=3.11e+06u
-M1001 a_217_207# a_117_181# a_64_207# VNB nhv w=420000u l=500000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR A a_231_463# VPB phv w=750000u l=500000u
-+  ad=1.02225e+12p pd=5.2e+06u as=4.0875e+11p ps=4.09e+06u
-M1003 VGND A a_217_207# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_117_181# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1005 a_231_463# A a_117_181# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1006 a_231_463# a_117_181# a_78_463# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1007 a_217_207# A a_117_181# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_117_181# A a_231_463# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X1 a_117_181# A a_217_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_78_463# VGND VNB mrdn_hv w=290000u l=1.355e+06u
+X3 a_64_207# VPWR VPB mrdp_hv w=290000u l=3.11e+06u
+X4 a_231_463# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X5 a_64_207# a_117_181# a_217_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND a_117_181# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 VPWR a_117_181# X VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_217_207# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_78_463# a_117_181# a_231_463# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.cdl
index 4ea199a..9761194 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hvl__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
-MI98 n0 D VNB nhv 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
-MI14 net076 RESET_B VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI98 n0 D VNB nfet_g5v0d10v5 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 db sceb VNB nhv 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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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
-MI651 Q_N s0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI14 net076 RESET_B VNB nfet_g5v0d10v5 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 db sceb VNB nfet_g5v0d10v5 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
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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
+MI651 Q_N s0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI656 net062 s0 VNB nfet_g5v0d10v5 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
+MI657 net052 RESET_B VNB nfet_g5v0d10v5 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
+MI33 net51 RESET_B VNB nfet_g5v0d10v5 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
+MI4 M0 clkpos VNB nfet_g5v0d10v5 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
+MI34 net43 M1 VNB nfet_g5v0d10v5 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
+MI655 s0 clkneg VNB nfet_g5v0d10v5 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
+MI652 net069 s0 VNB nfet_g5v0d10v5 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
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI653 Q net069 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI647 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv 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
-MI656 net062 s0 VNB nhv 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
-MI657 net052 RESET_B VNB nhv 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
-MI33 net51 RESET_B VNB nhv 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
-MI4 M0 clkpos VNB nhv 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
-MI34 net43 M1 VNB nhv 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
-MI655 s0 clkneg VNB nhv 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
-MI652 net069 s0 VNB nhv 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
-MI49 sceb SCE VNB nhv 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
-MI653 Q net069 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI647 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phv 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
-MI15 db RESET_B VPB phv 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
-MI101 db sceb VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI662 net089 net062 VPB phv 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
-MI659 net062 RESET_B VPB phv 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
-MI664 s0 clkpos VPB phv 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
-MI658 net062 s0 VPB phv 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
-MI30 net54 M1 VPB phv 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
-MI31 M0 clkneg VPB phv 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
-MI32 M0 RESET_B VPB phv 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
-MI663 net069 s0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net069 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N s0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI50 sceb SCE VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 db RESET_B VPB pfet_g5v0d10v5 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
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI662 net089 net062 VPB pfet_g5v0d10v5 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
+MI659 net062 RESET_B VPB pfet_g5v0d10v5 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
+MI664 s0 clkpos VPB pfet_g5v0d10v5 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
+MI658 net062 s0 VPB pfet_g5v0d10v5 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
+MI30 net54 M1 VPB pfet_g5v0d10v5 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
+MI31 M0 clkneg VPB pfet_g5v0d10v5 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
+MI32 M0 RESET_B VPB pfet_g5v0d10v5 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
+MI663 net069 s0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net069 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 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_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.netlist.tsv
index 4f22737..14fcc83 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_hvl__sdfrbp_1	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	n0	D	net076	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI14	MOSFET	net076	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net076	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI651	MOSFET	Q_N	s0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net062	s0	net052	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net052	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net51	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net43	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net43	M1	net51	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net069	s0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net069	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	db	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net089	net062	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net089	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net54	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net54	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net069	s0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net069	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	n0	D	net076	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI14	MOSFET	net076	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net076	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net062	s0	net052	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net052	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net51	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net43	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net43	M1	net51	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net069	s0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net069	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	db	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net089	net062	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net089	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net54	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net54	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net069	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net069	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.spice b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.spice
index b903023..40837df 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.spice
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1569_126# a_1290_126# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.1909e+12p ps=1.226e+07u
-M1001 a_496_655# D a_339_655# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.738e+11p ps=4.3e+06u
-M1002 a_1290_126# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=2.188e+12p ps=2.015e+07u
-M1003 a_2014_537# a_1816_659# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 a_1999_126# a_1569_126# a_1816_659# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1005 a_2141_126# a_2014_537# a_1999_126# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 a_339_655# a_222_131# a_794_655# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 VGND RESET_B a_361_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=3.0115e+11p ps=3.2e+06u
-M1008 VGND RESET_B a_2141_126# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_2624_107# a_3613_443# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 Q a_3613_443# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1011 a_2871_543# a_1569_126# a_2624_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.312e+11p ps=2.79e+06u
-M1012 VPWR RESET_B a_339_655# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1816_659# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1014 a_3098_107# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1015 a_2841_81# a_2624_107# a_3098_107# VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1016 VPWR SCE a_496_655# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1816_659# a_1569_126# a_339_655# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_222_131# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1019 a_1569_126# a_1290_126# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1020 a_2799_107# a_1290_126# a_2624_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.4495e+11p ps=2.25e+06u
-M1021 VPWR a_2624_107# a_2841_81# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1022 Q a_3613_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1023 Q_N a_2624_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1024 a_2624_107# a_1290_126# a_2014_537# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_2841_81# a_2871_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1290_126# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1027 a_1816_659# a_1290_126# a_339_655# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1028 a_2624_107# a_1569_126# a_2014_537# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.06e+06u
-M1029 a_222_131# SCE VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1030 VGND a_2841_81# a_2799_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_816_107# SCE a_339_655# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1032 Q_N a_2624_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1033 a_794_655# SCD VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2841_81# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_361_107# SCD a_816_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_2624_107# a_3613_443# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1037 a_1972_659# a_1290_126# a_1816_659# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1038 VPWR a_2014_537# a_1972_659# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2014_537# a_1816_659# VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_518_107# D a_361_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1041 a_339_655# a_222_131# a_518_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_3098_107# a_2624_107# a_2841_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 VPWR SCD a_794_655# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X2 a_1999_126# a_2014_537# a_2141_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 VGND a_2624_107# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X4 a_1972_659# a_2014_537# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 a_2871_543# a_2841_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND CLK a_1290_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_2799_107# a_2841_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 a_2624_107# a_1290_126# a_2799_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 VPWR a_1290_126# a_1569_126# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X10 a_339_655# D a_496_655# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 a_1816_659# a_1290_126# a_1972_659# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 VPWR a_1816_659# a_2014_537# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X13 VPWR RESET_B a_2841_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 a_794_655# a_222_131# a_339_655# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 a_339_655# SCE a_816_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 VPWR CLK a_1290_126# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X17 VPWR RESET_B a_1816_659# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 VGND a_1816_659# a_2014_537# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X19 VGND SCE a_222_131# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 a_2841_81# a_2624_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X21 a_3613_443# a_2624_107# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 a_2141_126# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X23 a_361_107# D a_518_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X24 a_496_655# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X25 a_339_655# RESET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X26 VGND a_1290_126# a_1569_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 a_2014_537# a_1569_126# a_2624_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X28 a_2624_107# a_1569_126# a_2871_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 a_518_107# a_222_131# a_339_655# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X30 a_2014_537# a_1290_126# a_2624_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X31 a_361_107# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X32 VGND RESET_B a_3098_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X33 a_1816_659# a_1569_126# a_1999_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X34 a_3613_443# a_2624_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X35 VPWR a_3613_443# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X36 VPWR SCE a_222_131# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X37 a_339_655# a_1290_126# a_1816_659# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X38 VPWR a_2624_107# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X39 VGND a_3613_443# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X40 a_339_655# a_1569_126# a_1816_659# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X41 a_816_107# SCD a_361_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.cdl
index 8181840..84ab517 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_hvl__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
-MI98 n0 D VNB nhv 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
-MI14 net076 RESET_B VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI98 n0 D VNB nfet_g5v0d10v5 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 db sceb VNB nhv 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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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
-MI46 clkpos clkneg VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI14 net076 RESET_B VNB nfet_g5v0d10v5 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 db sceb VNB nfet_g5v0d10v5 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
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI656 net062 s0 VNB nfet_g5v0d10v5 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
+MI657 net052 RESET_B VNB nfet_g5v0d10v5 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
+MI33 net51 RESET_B VNB nfet_g5v0d10v5 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
+MI4 M0 clkpos VNB nfet_g5v0d10v5 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
+MI34 net43 M1 VNB nfet_g5v0d10v5 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
+MI655 s0 clkneg VNB nfet_g5v0d10v5 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
+MI652 net069 s0 VNB nfet_g5v0d10v5 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
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI653 Q net069 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI647 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv 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
-MI656 net062 s0 VNB nhv 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
-MI657 net052 RESET_B VNB nhv 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
-MI33 net51 RESET_B VNB nhv 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
-MI4 M0 clkpos VNB nhv 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
-MI34 net43 M1 VNB nhv 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
-MI655 s0 clkneg VNB nhv 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
-MI652 net069 s0 VNB nhv 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
-MI49 sceb SCE VNB nhv 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
-MI653 Q net069 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI647 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phv 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
-MI15 db RESET_B VPB phv 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
-MI101 db sceb VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI662 net089 net062 VPB phv 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
-MI659 net062 RESET_B VPB phv 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
-MI664 s0 clkpos VPB phv 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
-MI658 net062 s0 VPB phv 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
-MI30 net54 M1 VPB phv 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
-MI31 M0 clkneg VPB phv 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
-MI32 M0 RESET_B VPB phv 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
-MI663 net069 s0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net069 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI50 sceb SCE VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 db RESET_B VPB pfet_g5v0d10v5 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
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI662 net089 net062 VPB pfet_g5v0d10v5 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
+MI659 net062 RESET_B VPB pfet_g5v0d10v5 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
+MI664 s0 clkpos VPB pfet_g5v0d10v5 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
+MI658 net062 s0 VPB pfet_g5v0d10v5 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
+MI30 net54 M1 VPB pfet_g5v0d10v5 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
+MI31 M0 clkneg VPB pfet_g5v0d10v5 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
+MI32 M0 RESET_B VPB pfet_g5v0d10v5 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
+MI663 net069 s0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net069 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.netlist.tsv
index 871bb37..45052af 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hvl__sdfrtp_1	CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI98	MOSFET	n0	D	net076	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI14	MOSFET	net076	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net076	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net062	s0	net052	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net052	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net51	RESET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net43	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net43	M1	net51	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net069	s0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net069	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	db	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net089	net062	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net089	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net54	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net54	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net069	s0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net069	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	n0	D	net076	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI14	MOSFET	net076	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net076	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net062	s0	net052	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net052	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net51	RESET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net43	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net43	M1	net51	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net069	s0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net069	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	db	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net089	net062	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net089	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net54	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net54	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net069	s0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net069	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.spice b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.spice
index 865aa62..2b3035f 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.spice
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_2539_181# a_1212_100# a_2360_115# VNB nhv w=420000u l=500000u
-+  ad=2.247e+11p pd=1.91e+06u as=2.5995e+11p ps=2.29e+06u
-M1001 a_1468_126# a_1212_471# a_1312_126# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_294_126# SCD a_137_126# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1003 a_1468_641# a_1212_100# a_1312_126# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1004 a_137_126# D a_592_126# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 VGND a_2360_115# a_3417_443# VNB nhv w=420000u l=500000u
-+  ad=9.8655e+11p pd=1.017e+07u as=1.197e+11p ps=1.41e+06u
-M1006 a_2616_417# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.9878e+12p ps=1.661e+07u
-M1007 a_1510_100# a_1312_126# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=0p ps=0u
-M1008 a_222_649# a_116_451# a_65_649# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.57e+11p ps=4.22e+06u
-M1009 a_1510_100# a_1312_126# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1010 a_1610_126# a_1510_100# a_1468_126# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 VPWR SCD a_222_649# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_116_451# SCE VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1013 VGND RESET_B a_1610_126# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_116_451# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1015 VPWR a_1510_100# a_1468_641# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_65_649# SCE a_294_126# VNB nhv w=420000u l=500000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1017 Q a_3417_443# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1018 a_1212_100# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1019 VPWR RESET_B a_65_649# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1212_100# a_1212_471# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1021 VGND a_2616_417# a_2539_181# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1312_126# a_1212_100# a_65_649# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_2574_543# a_1212_471# a_2360_115# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.912e+11p ps=2.91e+06u
-M1024 VGND RESET_B a_137_126# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2904_181# RESET_B VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1026 a_1312_126# a_1212_471# a_65_649# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1312_126# RESET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_2360_115# a_2616_417# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_2360_115# a_3417_443# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1030 a_2360_115# a_1212_471# a_1510_100# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2616_417# a_2360_115# a_2904_181# VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1032 VGND a_1212_100# a_1212_471# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1033 VGND CLK a_1212_100# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1034 Q a_3417_443# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1035 a_524_649# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1036 a_2360_115# a_1212_100# a_1510_100# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_65_649# D a_524_649# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_592_126# a_116_451# a_65_649# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2616_417# a_2574_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SCE a_116_451# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 VGND SCE a_116_451# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_1510_100# a_1212_471# a_2360_115# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_2574_543# a_2616_417# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 VGND RESET_B a_2904_181# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_1212_100# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND a_3417_443# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 a_294_126# SCE a_65_649# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR a_3417_443# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 a_1610_126# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_3417_443# a_2360_115# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 a_524_649# D a_65_649# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_2360_115# a_1212_100# a_2539_181# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 a_137_126# RESET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 a_2539_181# a_2616_417# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 a_222_649# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X16 VPWR CLK a_1212_100# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X17 a_65_649# RESET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 a_1468_641# a_1510_100# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 VPWR RESET_B a_2616_417# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 a_3417_443# a_2360_115# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X21 a_65_649# a_116_451# a_592_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 a_1312_126# a_1212_100# a_1468_641# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 VPWR a_1312_126# a_1510_100# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X24 VGND a_1312_126# a_1510_100# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X25 a_1468_126# a_1510_100# a_1610_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X26 a_2904_181# a_2360_115# a_2616_417# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 VPWR SCE a_524_649# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X28 a_65_649# a_1212_471# a_1312_126# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 VPWR RESET_B a_1312_126# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X30 a_2360_115# a_1212_471# a_2574_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X31 a_1212_471# a_1212_100# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X32 a_1312_126# a_1212_471# a_1468_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X33 a_1212_471# a_1212_100# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X34 a_137_126# SCD a_294_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X35 a_65_649# a_116_451# a_222_649# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X36 a_2616_417# a_2360_115# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X37 a_65_649# a_1212_100# a_1312_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X38 a_592_126# D a_137_126# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X39 a_1510_100# a_1212_100# a_2360_115# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.cdl
index 9f44952..35e6547 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_hvl__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
-MI104 db sceb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI104 db sceb VNB nfet_g5v0d10v5 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
+MI98 n0 D VNB nfet_g5v0d10v5 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
-MI98 n0 D VNB nhv 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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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
-MI36 net125 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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
+MI36 net125 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI656 M1 M0 VNB nfet_g5v0d10v5 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
+MI654 net141 M1 VNB nfet_g5v0d10v5 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
+MI34 S0 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI25 net153 SET_B VNB nfet_g5v0d10v5 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
+MI26 S0 clkneg VNB nfet_g5v0d10v5 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
+MI27 net161 S1 VNB nfet_g5v0d10v5 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
+MI647 S1 S0 VNB nfet_g5v0d10v5 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
+MI655 M0 clkpos VNB nfet_g5v0d10v5 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
+MI657 net136 SET_B VNB nfet_g5v0d10v5 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
+MI651 Q_N S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net265 S0 VNB nfet_g5v0d10v5 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
+MI653 Q net265 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI94 db D VPB pfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI656 M1 M0 VNB nhv 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
-MI654 net141 M1 VNB nhv 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
-MI34 S0 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv 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
-MI25 net153 SET_B VNB nhv 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
-MI26 S0 clkneg VNB nhv 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
-MI27 net161 S1 VNB nhv 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
-MI647 S1 S0 VNB nhv 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
-MI655 M0 clkpos VNB nhv 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
-MI657 net136 SET_B VNB nhv 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
-MI651 Q_N S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI652 net265 S0 VNB nhv 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
-MI653 Q net265 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 sceb SCE VNB nhv 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
-MI101 db sceb VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI94 db D VPB phv 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
-MI38 S0 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net212 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB phv 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
-MI662 net237 M1 VPB phv 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
-MI664 M0 clkneg VPB phv 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
-MI6 net248 S1 VPB phv 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
-MI5 S0 clkpos VPB phv 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
-MI24 S0 SET_B VPB phv 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
-MI648 S1 S0 VPB phv 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
-MI658 M1 M0 VPB phv 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
-MI663 net265 S0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net265 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI50 sceb SCE VPB phv 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
+MI38 S0 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net212 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 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_g5v0d10v5 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
+MI662 net237 M1 VPB pfet_g5v0d10v5 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
+MI664 M0 clkneg VPB pfet_g5v0d10v5 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
+MI6 net248 S1 VPB pfet_g5v0d10v5 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
+MI5 S0 clkpos VPB pfet_g5v0d10v5 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
+MI24 S0 SET_B VPB pfet_g5v0d10v5 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
+MI648 S1 S0 VPB pfet_g5v0d10v5 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
+MI658 M1 M0 VPB pfet_g5v0d10v5 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
+MI663 net265 S0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net265 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 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_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.netlist.tsv
index 9effb47..82127b6 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_hvl__sdfsbp_1	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	n0	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI36	MOSFET	net125	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net136	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net141	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net125	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net153	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net161	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net161	S1	net153	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net141	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net136	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net265	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net265	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net212	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net212	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net237	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net237	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net248	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net248	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net265	S0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net265	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	n0	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI36	MOSFET	net125	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net136	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net141	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net125	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net153	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net161	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net161	S1	net153	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net141	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net136	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net265	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net265	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net212	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net212	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net237	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net237	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net248	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net248	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net265	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net265	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.spice b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.spice
index 6abe38f..fb13cf5 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.spice
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR SCE a_30_569# VPB phv w=420000u l=500000u
-+  ad=2.0529e+12p pd=1.829e+07u as=1.197e+11p ps=1.41e+06u
-M1001 a_972_569# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.41165e+12p ps=1.411e+07u
-M1002 VPWR a_2501_543# a_2729_463# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1003 Q a_3609_173# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1004 a_1513_120# a_1243_116# a_485_569# VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1005 a_641_569# a_30_569# a_485_569# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VPWR SCD a_641_569# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1513_120# a_972_569# a_485_569# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1008 a_2715_173# a_972_569# a_2501_543# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.5995e+11p ps=2.29e+06u
-M1009 a_2857_173# a_2729_463# a_2715_173# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND SET_B a_2857_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1243_116# a_972_569# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1012 a_343_569# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_1711_94# a_1513_120# VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1014 VGND SCE a_30_569# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1015 a_485_569# D a_343_569# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_646_107# SCE a_485_569# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1017 VGND SCD a_646_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR SET_B a_1711_94# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_3609_173# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1020 a_2687_543# a_1243_116# a_2501_543# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.859e+11p ps=4.27e+06u
-M1021 a_2359_543# a_1513_120# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1022 a_1243_116# a_972_569# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1023 a_1669_120# a_1243_116# a_1513_120# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1024 a_2394_107# a_1513_120# VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1025 a_972_569# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1026 Q_N a_2501_543# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1027 VGND a_2501_543# a_2729_463# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1028 a_485_569# a_30_569# a_348_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1029 a_348_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1710_556# a_972_569# a_1513_120# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1031 a_2501_543# SET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_2501_543# a_3609_173# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1033 a_2077_107# a_1513_120# a_1711_94# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1034 VGND a_2501_543# a_3609_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1035 VPWR a_1711_94# a_1710_556# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q_N a_2501_543# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1037 a_2501_543# a_972_569# a_2359_543# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SET_B a_2077_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2729_463# a_2687_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_1711_94# a_1669_120# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_2501_543# a_1243_116# a_2394_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_641_569# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 VGND a_972_569# a_1243_116# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_2501_543# a_972_569# a_2715_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_485_569# a_1243_116# a_1513_120# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 a_1711_94# a_1513_120# a_2077_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 VGND D a_348_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VPWR a_2501_543# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 a_348_107# a_30_569# a_485_569# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 a_2857_173# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 VPWR CLK a_972_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X10 a_343_569# D a_485_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 a_1513_120# a_972_569# a_1710_556# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_2394_107# a_1243_116# a_2501_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X13 a_2501_543# a_1243_116# a_2687_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 a_2729_463# a_2501_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 a_3609_173# a_2501_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 VPWR a_3609_173# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X17 VPWR SET_B a_2501_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X18 a_646_107# SCD VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 a_3609_173# a_2501_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X20 a_485_569# a_30_569# a_641_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X21 a_30_569# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 VPWR a_972_569# a_1243_116# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X23 VGND a_3609_173# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X24 a_2729_463# a_2501_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X25 VGND CLK a_972_569# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X26 a_1669_120# a_1711_94# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 a_2715_173# a_2729_463# a_2857_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X28 a_30_569# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 a_1711_94# SET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X30 a_1513_120# a_1243_116# a_1669_120# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X31 VPWR SCE a_343_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X32 a_2687_543# a_2729_463# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X33 VGND a_2501_543# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X34 a_2359_543# a_972_569# a_2501_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X35 a_1710_556# a_1711_94# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X36 a_485_569# a_972_569# a_1513_120# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X37 a_485_569# SCE a_646_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X38 a_2077_107# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X39 VPWR a_1513_120# a_1711_94# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X40 VPWR a_1513_120# a_2359_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X41 VGND a_1513_120# a_2394_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.cdl
index 24c6d01..c95918c 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_hvl__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
-MI104 db sceb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI104 db sceb VNB nfet_g5v0d10v5 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
+MI98 n0 D VNB nfet_g5v0d10v5 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
-MI98 n0 D VNB nhv 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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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
-MI36 net125 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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
+MI36 net125 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_g5v0d10v5 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
+MI44 clkneg CLK VNB nfet_g5v0d10v5 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
+MI656 M1 M0 VNB nfet_g5v0d10v5 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
+MI654 net141 M1 VNB nfet_g5v0d10v5 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
+MI34 S0 clkpos VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI25 net153 SET_B VNB nfet_g5v0d10v5 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
+MI26 S0 clkneg VNB nfet_g5v0d10v5 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
+MI27 net161 S1 VNB nfet_g5v0d10v5 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
+MI647 S1 S0 VNB nfet_g5v0d10v5 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
+MI655 M0 clkpos VNB nfet_g5v0d10v5 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
+MI657 net136 SET_B VNB nfet_g5v0d10v5 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
+MI652 net265 S0 VNB nfet_g5v0d10v5 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
+MI653 Q net265 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI94 db D VPB pfet_g5v0d10v5 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
-MI42 db clkneg VNB nhv 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
-MI44 clkneg CLK VNB nhv 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
-MI656 M1 M0 VNB nhv 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
-MI654 net141 M1 VNB nhv 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
-MI34 S0 clkpos VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nhv 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
-MI25 net153 SET_B VNB nhv 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
-MI26 S0 clkneg VNB nhv 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
-MI27 net161 S1 VNB nhv 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
-MI647 S1 S0 VNB nhv 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
-MI655 M0 clkpos VNB nhv 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
-MI657 net136 SET_B VNB nhv 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
-MI652 net265 S0 VNB nhv 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
-MI653 Q net265 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 sceb SCE VNB nhv 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
-MI101 db sceb VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI94 db D VPB phv 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
-MI38 S0 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net212 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phv 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
-MI45 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M1 SET_B VPB phv 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
-MI662 net237 M1 VPB phv 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
-MI664 M0 clkneg VPB phv 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
-MI6 net248 S1 VPB phv 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
-MI5 S0 clkpos VPB phv 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
-MI24 S0 SET_B VPB phv 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
-MI648 S1 S0 VPB phv 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
-MI658 M1 M0 VPB phv 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
-MI663 net265 S0 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net265 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI50 sceb SCE VPB phv 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
+MI38 S0 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net212 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_g5v0d10v5 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
+MI45 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 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_g5v0d10v5 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
+MI662 net237 M1 VPB pfet_g5v0d10v5 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
+MI664 M0 clkneg VPB pfet_g5v0d10v5 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
+MI6 net248 S1 VPB pfet_g5v0d10v5 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
+MI5 S0 clkpos VPB pfet_g5v0d10v5 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
+MI24 S0 SET_B VPB pfet_g5v0d10v5 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
+MI648 S1 S0 VPB pfet_g5v0d10v5 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
+MI658 M1 M0 VPB pfet_g5v0d10v5 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
+MI663 net265 S0 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net265 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.netlist.tsv b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.netlist.tsv
index a7c2267..74d4cfc 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_hvl__sdfstp_1	CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	n0	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI36	MOSFET	net125	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net136	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net141	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net125	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net153	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net161	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net161	S1	net153	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net141	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net136	SET_B	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net265	S0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net265	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net212	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net212	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net237	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net237	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net248	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net248	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net265	S0	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net265	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	n0	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI36	MOSFET	net125	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net136	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net141	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net125	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net153	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net161	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net161	S1	net153	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net141	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net136	SET_B	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net265	S0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net265	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net212	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net212	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net237	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net237	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net248	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net248	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net265	S0	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net265	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.spice b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.spice
index 0ae405e..9ca2b7e 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.spice
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_1669_87# a_1686_543# VPB phv w=420000u l=500000u
-+  ad=1.6501e+12p pd=1.563e+07u as=8.82e+10p ps=1.26e+06u
-M1001 VGND SCD a_637_107# VNB nhv w=420000u l=500000u
-+  ad=1.1496e+12p pd=1.181e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1201_123# a_935_107# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 Q a_3321_173# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1004 a_1471_113# a_1201_123# a_481_107# VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1005 a_2656_543# a_1201_123# a_2477_543# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.425e+11p ps=4.16e+06u
-M1006 a_339_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_481_107# a_30_107# a_339_107# VNB nhv w=420000u l=500000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1008 a_935_107# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1009 VPWR a_2698_421# a_2656_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND SET_B a_2035_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_2352_107# a_1471_113# VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1012 VPWR SCE a_30_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 a_2477_543# a_1201_123# a_2352_107# VNB nhv w=750000u l=500000u
-+  ad=2.4495e+11p pd=2.25e+06u as=0p ps=0u
-M1014 a_2812_173# a_2698_421# a_2669_173# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=9.03e+10p ps=1.27e+06u
-M1015 VGND SET_B a_2812_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_2335_543# a_1471_113# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1017 a_637_569# a_30_107# a_481_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_1669_87# a_1471_113# VPWR VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 a_2477_543# a_935_107# a_2335_543# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_2477_543# a_2698_421# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1021 VPWR SCD a_637_569# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_2035_107# a_1471_113# a_1669_87# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1023 a_2698_421# a_2477_543# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1024 a_1627_113# a_1201_123# a_1471_113# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1025 VGND a_1669_87# a_1627_113# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1686_543# a_935_107# a_1471_113# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR SET_B a_1669_87# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_935_107# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1029 a_339_569# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_481_107# D a_339_569# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND SCE a_30_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1032 VGND a_2477_543# a_3321_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 VPWR a_2477_543# a_3321_173# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1034 a_1471_113# a_935_107# a_481_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Q a_3321_173# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1036 a_2669_173# a_935_107# a_2477_543# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1201_123# a_935_107# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1038 a_2477_543# SET_B VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_637_107# SCE a_481_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_2477_543# a_2698_421# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X1 a_2352_107# a_1201_123# a_2477_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 VGND a_3321_173# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_30_107# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_1471_113# a_1201_123# a_1627_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 VPWR SCE a_339_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X6 VPWR a_1471_113# a_1669_87# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X7 a_1471_113# a_935_107# a_1686_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X8 VGND CLK a_935_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_2477_543# a_935_107# a_2669_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_339_569# D a_481_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 a_481_107# a_1201_123# a_1471_113# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 VPWR a_1471_113# a_2335_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X13 a_481_107# a_935_107# a_1471_113# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 a_1669_87# SET_B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 a_481_107# SCE a_637_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 a_2812_173# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VPWR CLK a_935_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X18 a_637_569# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 a_2656_543# a_2698_421# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 VGND a_1471_113# a_2352_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X21 a_1686_543# a_1669_87# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X22 a_30_107# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 a_2035_107# SET_B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X24 a_1627_113# a_1669_87# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 VPWR SET_B a_2477_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X26 VGND D a_339_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X27 a_1669_87# a_1471_113# a_2035_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X28 a_339_107# a_30_107# a_481_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X29 VPWR a_3321_173# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X30 a_2698_421# a_2477_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X31 VGND a_935_107# a_1201_123# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X32 a_2669_173# a_2698_421# a_2812_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X33 a_3321_173# a_2477_543# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X34 a_3321_173# a_2477_543# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X35 a_481_107# a_30_107# a_637_569# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X36 VPWR a_935_107# a_1201_123# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X37 a_2477_543# a_1201_123# a_2656_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X38 a_2335_543# a_935_107# a_2477_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X39 a_637_107# SCD VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.cdl
index da5415e..cba08b9 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_hvl__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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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 db sceb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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 db sceb VNB nfet_g5v0d10v5 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
+MI98 n0 D VNB nfet_g5v0d10v5 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
-MI98 n0 D VNB nhv 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
-MI657 M0 clkpos VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_g5v0d10v5 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
+MI656 net72 M1 VNB nfet_g5v0d10v5 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
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI646 Q S1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net116 S1 VNB nfet_g5v0d10v5 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
+MI648 db clkneg VNB nfet_g5v0d10v5 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
+MI642 S0 clkneg VNB nfet_g5v0d10v5 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
+MI641 net48 S1 VNB nfet_g5v0d10v5 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
+MI661 Q_N net116 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_g5v0d10v5 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
+MI649 S1 S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI634 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI94 db D VPB pfet_g5v0d10v5 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
-MI656 net72 M1 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI659 M0 clkneg VPB pfet_g5v0d10v5 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
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
+MI660 Q_N net116 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_g5v0d10v5 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
+MI647 net116 S1 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net119 S1 VPB pfet_g5v0d10v5 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
+MI638 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net100 M1 VPB pfet_g5v0d10v5 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
+MI645 Q S1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 sceb SCE VNB nhv 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
-MI646 Q S1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI662 net116 S1 VNB nhv 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
-MI648 db clkneg VNB nhv 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
-MI642 S0 clkneg VNB nhv 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
-MI641 net48 S1 VNB nhv 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
-MI661 Q_N net116 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nhv 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
-MI649 S1 S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI634 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI94 db D VPB phv 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
-MI659 M0 clkneg VPB phv 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
-MI50 sceb SCE VPB phv 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
-MI660 Q_N net116 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phv 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
-MI647 net116 S1 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI643 net119 S1 VPB phv 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
-MI638 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net100 M1 VPB phv 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
-MI645 Q S1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phv 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
-MI653 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_g5v0d10v5 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
+MI653 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.netlist.tsv
index faf8214..bd9679f 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_hvl__sdfxbp_1	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	n0	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net72	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net116	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net48	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net116	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net100	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net116	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net119	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net116	S1	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net119	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	n0	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net116	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net48	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net116	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net100	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net116	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net119	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net116	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net119	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.spice b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.spice
index e9db148..57fe086 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.spice
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR SCD a_268_659# VPB phv w=420000u l=500000u
-+  ad=2.1652e+12p pd=1.853e+07u as=2.31e+11p ps=2.78e+06u
-M1001 a_1528_579# a_1067_107# VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1002 a_1124_81# a_1570_457# a_1528_579# VPB phv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 VGND a_1124_81# a_1067_107# VNB nhv w=750000u l=500000u
-+  ad=1.482e+12p pd=1.366e+07u as=3.3345e+11p ps=3.48e+06u
-M1004 VGND a_1570_457# a_1726_453# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 a_2518_445# a_1726_453# a_1067_107# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 a_2789_147# a_2518_445# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1007 a_581_659# D a_567_107# VPB phv w=420000u l=500000u
-+  ad=2.226e+11p pd=2.74e+06u as=2.373e+11p ps=2.81e+06u
-M1008 a_1570_457# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1009 VPWR a_2789_147# Q VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.975e+11p ps=3.53e+06u
-M1010 VGND a_2789_147# Q VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1375e+11p ps=2.07e+06u
-M1011 Q_N a_3531_107# VGND VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1012 a_1454_173# a_1067_107# VGND VNB nhv w=420000u l=500000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1013 a_723_107# a_30_515# a_567_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1014 VGND D a_723_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_2789_147# a_2518_445# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1016 a_567_107# a_30_515# a_268_659# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1124_81# a_1570_457# a_567_107# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1018 a_581_659# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_425_107# SCD VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 a_567_107# SCE a_425_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q_N a_3531_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1022 VPWR SCE a_30_515# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1023 VPWR a_2789_147# a_2365_445# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1024 VPWR a_1570_457# a_1726_453# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1025 a_1067_107# a_1570_457# a_2518_445# VPB phv w=1e+06u l=500000u
-+  ad=5.5e+11p pd=5.1e+06u as=3.112e+11p ps=2.75e+06u
-M1026 a_1570_457# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1027 a_567_107# a_1726_453# a_1124_81# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND SCE a_30_515# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1029 a_2747_173# a_1570_457# a_2518_445# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_1454_173# a_1726_453# a_1124_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_2789_147# a_2747_173# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_3531_107# a_2789_147# VGND VNB nhv w=420000u l=500000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1033 a_3531_107# a_2789_147# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1034 a_2518_445# a_1726_453# a_2365_445# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_1124_81# a_1067_107# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1528_579# a_1570_457# a_1124_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 a_425_107# SCE a_567_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 VGND a_2518_445# a_2789_147# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_2365_445# a_2789_147# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 VGND CLK a_1570_457# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X5 a_30_515# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 a_567_107# a_30_515# a_723_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 VPWR a_2789_147# a_3531_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X8 a_2518_445# a_1570_457# a_2747_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_268_659# a_30_515# a_567_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X10 VPWR CLK a_1570_457# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 a_567_107# a_1570_457# a_1124_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X12 VGND SCD a_425_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X13 a_567_107# D a_581_659# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 VGND a_1067_107# a_1454_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 VGND a_3531_107# Q_N VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X16 a_268_659# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X17 a_1067_107# a_1726_453# a_2518_445# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X18 a_1067_107# a_1124_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X19 a_1124_81# a_1726_453# a_567_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X20 VPWR a_3531_107# Q_N VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X21 a_1726_453# a_1570_457# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X22 a_723_107# D VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X23 Q a_2789_147# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X24 a_1124_81# a_1726_453# a_1454_173# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 a_30_515# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X26 a_1067_107# a_1124_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X27 a_2747_173# a_2789_147# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X28 VGND a_2789_147# a_3531_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X29 VPWR a_2518_445# a_2789_147# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X30 Q a_2789_147# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X31 a_2365_445# a_1726_453# a_2518_445# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X32 a_1726_453# a_1570_457# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X33 VPWR a_1067_107# a_1528_579# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X34 VPWR SCE a_581_659# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X35 a_2518_445# a_1570_457# a_1067_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.cdl
index 698e464..076971d 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_hvl__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
-MI120 db SCE VNB nhv 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
-MI103 n1 SCD VNB nhv 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 db sceb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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 db sceb VNB nfet_g5v0d10v5 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
+MI98 n0 D VNB nfet_g5v0d10v5 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
-MI98 n0 D VNB nhv 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
-MI657 M0 clkpos VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_g5v0d10v5 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
+MI656 net72 M1 VNB nfet_g5v0d10v5 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
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
+MI646 Q S1 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_g5v0d10v5 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
+MI642 S0 clkneg VNB nfet_g5v0d10v5 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
+MI641 net48 S1 VNB nfet_g5v0d10v5 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
+MI652 M1 clkpos VNB nfet_g5v0d10v5 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
+MI649 S1 S0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI634 M1 M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_g5v0d10v5 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
+MI108 p1 SCD VPB pfet_g5v0d10v5 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
+MI107 p0 SCE VPB pfet_g5v0d10v5 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
+MI94 db D VPB pfet_g5v0d10v5 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
-MI656 net72 M1 VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI659 M0 clkneg VPB pfet_g5v0d10v5 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
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
+MI650 S1 S0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_g5v0d10v5 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
+MI639 M1 M0 VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net119 S1 VPB pfet_g5v0d10v5 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
+MI638 clkneg CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net100 M1 VPB pfet_g5v0d10v5 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
+MI645 Q S1 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 sceb SCE VNB nhv 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
-MI646 Q S1 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nhv 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
-MI642 S0 clkneg VNB nhv 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
-MI641 net48 S1 VNB nhv 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
-MI652 M1 clkpos VNB nhv 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
-MI649 S1 S0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI634 M1 M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phv 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
-MI108 p1 SCD VPB phv 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
-MI107 p0 SCE VPB phv 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
-MI94 db D VPB phv 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
-MI659 M0 clkneg VPB phv 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
-MI50 sceb SCE VPB phv 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
-MI650 S1 S0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phv 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
-MI639 M1 M0 VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI643 net119 S1 VPB phv 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
-MI638 clkneg CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net100 M1 VPB phv 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
-MI645 Q S1 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phv 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
-MI653 M1 clkneg VPB phv m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_g5v0d10v5 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
+MI653 M1 clkneg VPB pfet_g5v0d10v5 m=1 w=1.0 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.netlist.tsv
index 505181a..e4aa6e0 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_hvl__sdfxtp_1	CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	n0	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net72	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net48	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net100	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net119	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net119	S1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phv	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	n0	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net48	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net100	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net119	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net119	S1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_g5v0d10v5	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.spice b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.spice
index 06362da..8fb4087 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.spice
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_hvl__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_2310_107# a_938_107# a_2123_543# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1001 VGND a_2352_81# a_2310_107# VNB nhv w=420000u l=500000u
-+  ad=1.05015e+12p pd=1.074e+07u as=0p ps=0u
-M1002 a_2352_81# a_2123_543# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1003 VPWR SCE a_30_593# VPB phv w=420000u l=500000u
-+  ad=1.6012e+12p pd=1.475e+07u as=1.197e+11p ps=1.41e+06u
-M1004 VPWR a_2352_81# a_2302_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.05e+11p ps=1.34e+06u
-M1005 a_2352_81# a_2123_543# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1006 a_641_593# a_30_593# a_484_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1007 VPWR SCD a_641_593# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_938_107# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_938_107# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1010 VPWR a_2352_81# Q VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.975e+11p ps=3.53e+06u
-M1011 VGND SCE a_30_593# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VGND a_2352_81# Q VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1013 a_1688_81# a_1490_107# VGND VNB nhv w=750000u l=500000u
-+  ad=2.5995e+11p pd=2.29e+06u as=0p ps=0u
-M1014 a_343_593# SCE VPWR VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1015 a_640_107# SCE a_484_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.709e+11p ps=2.97e+06u
-M1016 a_484_107# D a_343_593# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1688_81# a_1490_107# VPWR VPB phv w=1e+06u l=500000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1018 VGND SCD a_640_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1204_107# a_938_107# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1020 a_1204_107# a_938_107# VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1021 a_1646_107# a_1204_107# a_1490_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1022 VGND a_1688_81# a_1646_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_2302_543# a_1204_107# a_2123_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=3.312e+11p ps=2.79e+06u
-M1024 a_1646_543# a_938_107# a_1490_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1025 a_342_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1026 VPWR a_1688_81# a_1646_543# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_484_107# a_30_593# a_342_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1490_107# a_938_107# a_484_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2123_543# a_1204_107# a_1688_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1490_107# a_1204_107# a_484_107# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2123_543# a_938_107# a_1688_81# VPB phv w=1e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2123_543# a_2352_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X1 VPWR CLK a_938_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X2 a_342_107# a_30_593# a_484_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_2123_543# a_938_107# a_2310_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X4 a_484_107# a_30_593# a_641_593# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X5 Q a_2352_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 a_1688_81# a_1204_107# a_2123_543# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_30_593# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X8 a_484_107# SCE a_640_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X9 a_1490_107# a_1204_107# a_1646_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_1490_107# a_938_107# a_1646_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X11 VPWR SCE a_343_593# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X12 a_2123_543# a_1204_107# a_2302_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X13 VGND a_938_107# a_1204_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 a_1688_81# a_938_107# a_2123_543# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X15 a_30_593# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 VGND D a_342_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X17 VGND CLK a_938_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X18 a_484_107# a_938_107# a_1490_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 a_2310_107# a_2352_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 a_484_107# a_1204_107# a_1490_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X21 a_2302_543# a_2352_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X22 a_641_593# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X23 a_640_107# SCD VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X24 a_1646_107# a_1688_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X25 VGND a_1490_107# a_1688_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X26 VPWR a_1490_107# a_1688_81# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1e+06u l=500000u
+X27 Q a_2352_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X28 a_1646_543# a_1688_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X29 a_343_593# D a_484_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X30 VPWR a_938_107# a_1204_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X31 VGND a_2123_543# a_2352_81# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.cdl
index beaa9ca..513e8aa 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_hvl__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
-MI635 clkneg clkpos VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 M1 M0 VPB phv 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
-MI29 net048 M1 VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 net048 CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 GCLK net048 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 clkpos CLK VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net59 M1 VPB phv 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
-MI651 M0 clkpos VPB phv 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
-MI638 net043 GATE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 M0 clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net037 SCE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 clkpos CLK VNB nhv 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
-MI649 GCLK net048 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net084 CLK VNB nhv 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
-MI652 M0 clkneg VNB nhv 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
-MI654 net102 M1 VNB nhv 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
-MI32 net043 GATE VNB nhv 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
-MI26 net043 SCE VNB nhv 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
-MI636 clkneg clkpos VNB nhv 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
-MI637 net043 clkpos VNB nhv 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
-MI30 net048 M1 VNB nhv 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
-MI23 M1 M0 VNB nhv 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
+MI635 clkneg clkpos VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 M1 M0 VPB pfet_g5v0d10v5 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
+MI29 net048 M1 VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 net048 CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 GCLK net048 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 clkpos CLK VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 net59 M1 VPB pfet_g5v0d10v5 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
+MI651 M0 clkpos VPB pfet_g5v0d10v5 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
+MI638 net043 GATE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 M0 clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net037 SCE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos CLK VNB nfet_g5v0d10v5 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
+MI649 GCLK net048 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net084 CLK VNB nfet_g5v0d10v5 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
+MI652 M0 clkneg VNB nfet_g5v0d10v5 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
+MI654 net102 M1 VNB nfet_g5v0d10v5 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
+MI32 net043 GATE VNB nfet_g5v0d10v5 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
+MI26 net043 SCE VNB nfet_g5v0d10v5 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
+MI636 clkneg clkpos VNB nfet_g5v0d10v5 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
+MI637 net043 clkpos VNB nfet_g5v0d10v5 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
+MI30 net048 M1 VNB nfet_g5v0d10v5 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
+MI23 M1 M0 VNB nfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.netlist.tsv
index 8c95f0a..514394c 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_hvl__sdlclkp_1	CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	M1	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net048	M1	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net048	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	GCLK	net048	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	CLK	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	M1	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net59	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	net043	GATE	net037	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	M0	clkneg	net043	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net037	SCE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	GCLK	net048	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net084	CLK	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	M1	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net043	GATE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net043	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	net043	clkpos	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net048	M1	net084	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	M1	M0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	M1	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net048	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net048	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	GCLK	net048	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	CLK	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	M1	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net59	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	net043	GATE	net037	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	M0	clkneg	net043	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net037	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	GCLK	net048	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net084	CLK	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	M1	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net043	GATE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net043	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	net043	clkpos	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net048	M1	net084	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	M1	M0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.spice b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.spice
index 031a63f..ac9eca8 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.spice
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_hvl__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_1261_133# a_495_311# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=5.8305e+11p ps=6.38e+06u
-M1001 GCLK a_1630_171# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1002 VGND SCE a_58_159# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=2.457e+11p ps=2.85e+06u
-M1003 a_1630_171# a_1261_133# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=1.20885e+12p ps=1.128e+07u
-M1004 a_423_71# CLK VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_1219_159# a_431_431# a_495_311# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.226e+11p ps=2.74e+06u
-M1006 VGND a_1261_133# a_1219_159# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_423_71# CLK VPWR VPB phv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1008 a_495_311# a_423_71# a_58_159# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1261_133# a_495_311# VPWR VPB phv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 VGND CLK a_1783_171# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1011 a_219_457# SCE VPWR VPB phv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=0p ps=0u
-M1012 GCLK a_1630_171# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.975e+11p pd=3.53e+06u as=0p ps=0u
-M1013 VGND a_423_71# a_431_431# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VPWR a_423_71# a_431_431# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=1.9875e+11p ps=2.03e+06u
-M1015 a_1219_457# a_423_71# a_495_311# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.1005e+11p ps=3.4e+06u
-M1016 VPWR a_1261_133# a_1219_457# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1783_171# a_1261_133# a_1630_171# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_58_159# GATE VGND VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_495_311# a_431_431# a_58_159# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.06e+06u
-M1020 a_58_159# GATE a_219_457# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR CLK a_1630_171# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_1630_171# GCLK VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 a_1783_171# CLK VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_58_159# a_423_71# a_495_311# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 VPWR a_1261_133# a_1630_171# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X4 VPWR SCE a_219_457# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X5 VPWR CLK a_423_71# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X6 VPWR a_1630_171# GCLK VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 a_431_431# a_423_71# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR a_495_311# a_1261_133# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X9 VGND CLK a_423_71# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X10 a_1630_171# a_1261_133# a_1783_171# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X11 a_58_159# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X12 a_219_457# GATE a_58_159# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X13 a_495_311# a_423_71# a_1219_457# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X14 a_1219_457# a_1261_133# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X15 VGND a_495_311# a_1261_133# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 a_58_159# a_431_431# a_495_311# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X17 a_1630_171# CLK VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X18 VGND GATE a_58_159# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X19 a_495_311# a_431_431# a_1219_159# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 a_431_431# a_423_71# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X21 a_1219_159# a_1261_133# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
 .ends
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.cdl b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.cdl
index b93d565..7ac5d43 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.cdl
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_hvl__sdlxtp_1 D GATE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI108 p1 SCD VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
+MI635 clkpos clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net069 M0 VPB pfet_g5v0d10v5 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
+MI25 db clkneg VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 Q M0 VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net069 M0 VPB phv 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
-MI25 db clkneg VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q M0 VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI633 clkneg GATE VPB phv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net59 net069 VPB phv 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
-MI651 M0 clkpos VPB phv 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
-MI50 sceb SCE VPB phv 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
-MI103 n1 SCD VNB nhv 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
-MI120 db SCE VNB nhv 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 db sceb VNB nhv m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI633 clkneg GATE VPB pfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 net59 net069 VPB pfet_g5v0d10v5 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
+MI651 M0 clkpos VPB pfet_g5v0d10v5 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
+MI50 sceb SCE VPB pfet_g5v0d10v5 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
+MI103 n1 SCD VNB nfet_g5v0d10v5 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
+MI120 db SCE VNB nfet_g5v0d10v5 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 db sceb VNB nfet_g5v0d10v5 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
+MI98 n0 D VNB nfet_g5v0d10v5 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
-MI98 n0 D VNB nhv 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
-MI634 clkneg GATE VNB nhv 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
-MI649 Q M0 VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nhv 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
-MI654 net102 net069 VNB nhv 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
-MI24 db clkpos VNB nhv 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
-MI636 clkpos clkneg VNB nhv 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
-MI23 net069 M0 VNB nhv 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
-MI49 sceb SCE VNB nhv 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
+MI634 clkneg GATE VNB nfet_g5v0d10v5 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
+MI649 Q M0 VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_g5v0d10v5 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
+MI654 net102 net069 VNB nfet_g5v0d10v5 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
+MI24 db clkpos VNB nfet_g5v0d10v5 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
+MI636 clkpos clkneg VNB nfet_g5v0d10v5 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
+MI23 net069 M0 VNB nfet_g5v0d10v5 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
+MI49 sceb SCE VNB nfet_g5v0d10v5 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
 .ENDS sky130_fd_sc_hvl__sdlxtp_1
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.netlist.tsv b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.netlist.tsv
index 2a14cb2..f27a03b 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.netlist.tsv
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_hvl__sdlxtp_1	D:I GATE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI108	MOSFET	p1	SCD	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net069	M0	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	db	clkneg	M0	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	M0	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	net069	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net59	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	sceb	SCE	VPWR	VPB	phv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI103	MOSFET	n1	SCD	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	db	sceb	n0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	n0	D	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	M0	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	net069	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	db	clkpos	M0	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net069	M0	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	sceb	SCE	VGND	VNB	nhv	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net069	M0	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	db	clkneg	M0	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	M0	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	net069	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net59	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	sceb	SCE	VPWR	VPB	pfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	db	sceb	n0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	n0	D	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.525	3.1
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	M0	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	net069	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	db	clkpos	M0	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net069	M0	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	sceb	SCE	VGND	VNB	nfet_g5v0d10v5	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.spice b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.spice
index dca1fed..3e22084 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.spice
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_hvl__sdlxtp_1 D GATE SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1724_593# a_1214_107# a_1480_107# VPB phv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.5995e+11p ps=2.29e+06u
-M1001 VPWR a_1678_81# a_1724_593# VPB phv w=420000u l=500000u
-+  ad=1.2621e+12p pd=1.158e+07u as=0p ps=0u
-M1002 a_1480_107# a_1214_107# a_489_107# VNB nhv w=420000u l=500000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_660_587# a_30_587# a_489_107# VPB phv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=4.2375e+11p ps=4.13e+06u
-M1004 VGND SCE a_30_587# VNB nhv w=420000u l=500000u
-+  ad=7.1325e+11p pd=7.84e+06u as=1.197e+11p ps=1.41e+06u
-M1005 a_1214_107# a_944_107# VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_944_107# GATE VGND VNB nhv w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_1480_107# a_944_107# a_489_107# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_645_107# SCE a_489_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND SCD a_645_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_362_587# SCE VPWR VPB phv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1011 VPWR a_1480_107# a_1678_81# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1012 VPWR SCD a_660_587# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_1480_107# a_1678_81# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 a_1214_107# a_944_107# VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
-M1015 a_347_107# D VGND VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1016 a_489_107# a_30_587# a_347_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_489_107# D a_362_587# VPB phv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR SCE a_30_587# VPB phv w=420000u l=500000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_1636_107# a_944_107# a_1480_107# VNB nhv w=420000u l=500000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 Q a_1480_107# VGND VNB nhv w=750000u l=500000u
-+  ad=1.9875e+11p pd=2.03e+06u as=0p ps=0u
-M1021 Q a_1480_107# VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=4.275e+11p pd=3.57e+06u as=0p ps=0u
-M1022 VGND a_1678_81# a_1636_107# VNB nhv w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_944_107# GATE VPWR VPB phv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=0p ps=0u
+X0 a_1724_593# a_1678_81# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X1 a_1480_107# a_944_107# a_1636_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X2 a_489_107# SCE a_645_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X3 a_1678_81# a_1480_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X4 a_489_107# a_30_587# a_660_587# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X5 a_489_107# a_1214_107# a_1480_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X6 VGND D a_347_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X7 a_1480_107# a_1214_107# a_1724_593# VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X8 VPWR a_944_107# a_1214_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X9 a_489_107# a_944_107# a_1480_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X10 VPWR SCE a_362_587# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X11 VPWR a_1480_107# Q VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X12 VPWR GATE a_944_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X13 a_1636_107# a_1678_81# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X14 VGND GATE a_944_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X15 VGND a_944_107# a_1214_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X16 a_660_587# SCD VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+X17 a_645_107# SCD VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X18 a_30_587# SCE VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=420000u l=500000u
+X19 a_30_587# SCE VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X20 a_347_107# a_30_587# a_489_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X21 a_1678_81# a_1480_107# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+X22 VGND a_1480_107# Q VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X23 a_362_587# D a_489_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.cdl
index 35440b4..a87a240 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPA B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.netlist.tsv b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.netlist.tsv
index 2817d0c..c18df16 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__xnor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.spice b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.spice
index de4fe69..f47dfaa 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.spice
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__xnor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_539_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=3.15e+11p pd=3.42e+06u as=1.3125e+12p ps=1.075e+07u
-M1001 Y B a_539_443# VPB phv w=1.5e+06u l=500000u
-+  ad=1.2675e+12p pd=4.69e+06u as=0p ps=0u
-M1002 Y a_30_107# a_523_107# VNB nhv w=750000u l=500000u
-+  ad=2.1375e+11p pd=2.07e+06u as=4.3125e+11p ps=4.15e+06u
-M1003 VPWR A a_30_107# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.2e+11p ps=3.56e+06u
-M1004 a_222_107# B a_30_107# VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=3.45e+11p ps=2.42e+06u
-M1005 VGND A a_222_107# VNB nhv w=750000u l=500000u
-+  ad=4.35e+11p pd=4.16e+06u as=0p ps=0u
-M1006 VGND B a_523_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_30_107# Y VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_523_107# A VGND VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_30_107# B VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_523_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X1 VPWR A a_539_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X2 VPWR B a_30_107# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X3 a_539_443# B Y VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_222_107# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 a_523_107# a_30_107# Y VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X6 a_523_107# B VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X7 Y a_30_107# VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X8 a_30_107# B a_222_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X9 a_30_107# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2_1.cdl b/cells/xor2/sky130_fd_sc_hvl__xor2_1.cdl
index c73411f..8646004 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_hvl__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 nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND A VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNA B VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 X inor VNB nhv m=1 w=0.75 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 X inor VPB phv m=1 w=1.5 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor0 inor A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND A VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNA B VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_g5v0d10v5 m=1 w=0.75 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_g5v0d10v5 m=1 w=1.5 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_hvl__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2_1.netlist.tsv b/cells/xor2/sky130_fd_sc_hvl__xor2_1.netlist.tsv
index 376f9dc..aab0f8d 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2_1.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_hvl__xor2_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNnor0	MOSFET	inor	A	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nhv	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phv	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_g5v0d10v5	1	0.75	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_g5v0d10v5	1	1.5	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2_1.spice b/cells/xor2/sky130_fd_sc_hvl__xor2_1.spice
index a9de69f..103cc94 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2_1.spice
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_hvl__xor2_1 A B VGND VNB VPB VPWR X
-M1000 a_531_443# a_30_443# X VPB phv w=1.5e+06u l=500000u
-+  ad=8.475e+11p pd=7.13e+06u as=4.275e+11p ps=3.57e+06u
-M1001 VPWR B a_531_443# VPB phv w=1.5e+06u l=500000u
-+  ad=1.1925e+12p pd=7.59e+06u as=0p ps=0u
-M1002 VGND a_30_443# X VNB nhv w=750000u l=500000u
-+  ad=1.08e+12p pd=7.38e+06u as=2.1e+11p ps=2.06e+06u
-M1003 a_617_107# A VGND VNB nhv w=750000u l=500000u
-+  ad=1.575e+11p pd=1.92e+06u as=0p ps=0u
-M1004 X B a_617_107# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_30_443# B VGND VNB nhv w=750000u l=500000u
-+  ad=2.1e+11p pd=2.06e+06u as=0p ps=0u
-M1006 a_531_443# A VPWR VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_187_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=3.15e+11p ps=3.42e+06u
-M1008 VGND A a_30_443# VNB nhv w=750000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_187_443# B a_30_443# VPB phv w=1.5e+06u l=500000u
-+  ad=0p pd=0u as=4.275e+11p ps=3.57e+06u
+X0 X a_30_443# a_531_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X1 VGND B a_30_443# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X2 a_30_443# A VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X3 a_30_443# B a_187_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X4 a_617_107# B X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X5 a_187_443# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X6 a_531_443# B VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X7 X a_30_443# VGND VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
+X8 VPWR A a_531_443# VPB sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+06u l=500000u
+X9 VGND A a_617_107# VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
 .ends